Clean up and removal of some old exceptions.
Fix Javadocs and code issues.