Get rid of args that do not seem to be necessary