Removed unneeded refactoring.