remove when loading_state