remove arguments from do_unpacking which cannot actually be specified...
do_unpacking
must be applied in conjunction with Moore!2979 (merged)