And remove unused commands from usage.
This puts a hard dependency on 20.09, but that's to be expected.