Eliminated some methods unused after refactoring.