client user employee stubs and some basic clean up