Removed unused code because of method refactoring.