Refactoring, cleaning up, slimming down ...