Update: Cleanup/Fixup USE for profile change.