Put back that comment. And I'm not done with that one yet.
Clean out some no longer needed stuff.