Cleanup a bunch of macro junk that was auto-magically added.