remove state checking