remove wait and file options; replace with -f (force) option