removed some defines from state