unused client code clean up