Refactoring and removing obsolete components.