Removing old classes
Using enums for decisions and results