Refactored unused code.