Remove deprecation from server, make more robust