Removed OPTIMIZE definitions