Get rid of unused and erroneous 'junkie-parameters'