Removed some stale defines.