Cleaning unused TODO