cleanups and removing RServe specs