Mostly just removed commented out code.