Removed old macros

Removed the old macros