Got rid of some bits I no longer use.
Ditto.