Clean up preprocessor definitions