2.0 remove deprecated stuff

I'm pretty unsure about the AbstractNeoServer changes; I've guessed at what the new code should look like, but I'd be happy to be told it's nonsense. Also, that code isn't well tested.