Remove some unneccessary macros