Continuing cleanup on collection workflow