Removed messy preprocessor directives