Get rid of --global options