Removed some unused macros.