Removed some obsolete defines.