This commented out code should be removed, I think.