Commented and refactored some unused code.