Merge "Remove commented defines"