yar-49 remove unused classes and code cleanup
#64: revert the guava upgrade move back to the version 14.0.1