Remove some defines not needed anymore