With this PR we should be able to drop all of the CommandV2 structures, right?