Removed unecessary preprocessor stuff