Spring cleaning

Killing all sorts of things, mostly dead or unreachablish code or otherwise noop.