add more tidyup for forget checker