QUASAR: Removing spurious TODO