Remove superfluous default values