Clean unused preprocessor macros (refs #55)