More code cleanup

Removed unused code and fixed comment got overwriten with global rename.
Merge branch 'develop' of https://github.com/splunk/splunk-sdk-java into develop