remove state references