More deletes and added functionality of upload