Removed refactoring problems.