Remove guava library but add specific classes needed