cleaned up client code by removing unused functions