De-crufting

Cleaned up a bit of dead code.