Bug fixes: remove files when uploaded