Remove override macros