remove weird state check