Clean up duel/cui.{h,cc}