Cleaning up library

* removing superfluous private keywords in classes
* removing unused stub classes
* few method clean ups