Fix portable profile + cleanup