better handling of download removal