Remove usage of guava maps