removed some defines.