Remove state check