remove double key handling