Cleaning previous refactoring.