Preprocessor is not used
Cleanups