nitcc: remove the use of NaiveCollection