Get rid of cruft.
Get rid of remaining uses of 'profiles'.
Ivy merge fixes.
More merge fixes.