remove state check