do_state_checks - simplify