Removing unused macros that now can be passed as arguments