Removing legacy, unused macros.