clean up macros, etc