cleaned up pre-processor directives