removing dependency on guava