ProfileEditor cleanup