Merge "Remove unused build flags"