Clean up some defines