clean-up of client code