i don't wholly understand the changes here, but i almost always favor deleting code over commenting it out (and if you comment it out you should leave a comment explaining why you did that instead of deleting it)