Removed old, commented out code.