Merge "Remove unused build code"