Removing guava and apache-commons dependency