Remove set usages in kiss