removing unneeded define, swapped with enum