Remove deprecated r21_p