Remove macros that we no longer need