removal of unnecessary preprocessor directives and underscores in file names