Get rid of unnecessary Set class