add key-iterator, rename "invalidate" to "remove"