Merge "remove unused #defines"