SWC-1289: Profile and profile editing cleanup