lots of cleanup
adjust version of android support lib and guava to match ones present in maven central