Fixed remove_key