removed redundant preprocessor directives