REFACTOR remove old/unused code & client related classes