bringing up to current
removed client
code refactor
code refactor