Cleanup and removal of unneeded enums