removed some defines