clean-up, added client only option (no proxy)