Remove some defines