Removed some defines.