fixed remove state