Removing a lot of dead code arising from refactorings in the backend