refactoring: remove dead enumeration items and dead code