Remove any reference for old metadata models