Removed commented out code that was left over from the refactoring.