Remove wrap and group from RA (it was moved to mapping)