bug/417/delete-upload



<!---
@huboard:{"order":240.8370361328125,"milestone_order":419,"custom_state":"ready"}
-->