slowly phasing and changing code to make way for Guava