Use the correct dir to cleanup. Lift incoming_dir out into a local varia...

...ble.