Upgraded to wrapper 2.1
Removed guava dependency from compilation deps