Disable sudo support for now, and fix argument grouping