metadata cdv: cleaning up