Clean before refactoring