Removing references to JSR166e Hashmap