removing artifacts of refactoring