Once again, commented out code's gotta die.