Removing legacy methods and cleaning up code