Fixed issue with missing Google's common library and cleaned up some cruft.