clean-up unneeded enums and types