Merge "Remove deadcode in VerityBuilder"