clean-up: Svr.hs