continue driver-server improvements

also remove deprecated code