removed unnecessary preprocessor