Removed unnecessary preprocessor conditionals