Profile removal fixes