Removed refactored code that's being unused.