Remove a few more global options from command