Removing Guava Classes
Merge branch 'pr/15'