leo: remove some defines