adds CPK data sources to end of Data Sources Listing in CDE

and also:

- code cleanup
- removal of guava lib dependency