Merge "Remove unused build targets"