remove hard-coded check id