Cleanup collection not as default_object and add to changelog