more metadata cleanup