Getting rid of some more relic code
Ditto