clean up some old server code

The main test is to see if anything (like integration tests) breaks. Check the jobs and play around a bit, e.g., try importing and viewing something at least.
--no-rebase as removes some public methods