Minor cleanup in client

Mostly:
- removed some unused classes
- added javadoc
- some layout improvements
- addition of @Override
- improved exception message (try to resolve IBM JDK build problem)
Merge pull request #1779 from pveentjer/clientcleanup

Minor cleanup in client