remove remaining state check