Remove finished refactorings