B-58092 removing dead code: UnaddressableKeyException