Removed commented out, refactored code.