Change order so store_callback is called after it's removed