Updated Client: removed unused variables etc.