Removed preprocessor statements