cleanup in new nested and navigation collections