Removing macros for now