There's a bit of needless boilerplate and dead code
just sort of sitting around in various places.

This commit cleans things up a bit.