Cleaning up compiler options