As a rule, yes. There's other commented out stuff hanging around too and I'm often the offender though so I've just been occasionally deleting commented out stuff as I encounter it. :)

I'll take a pass and do it in this PR though.