- Removed/moved some macros