Move demo client usage to a different section