Remove dependence on ring-serve