Organized Imports
Removing deprecated Enum classes
Removing legacy exception handling and infrastructure