removed tons of unmaintained preprocessor macros