Removing duplicate user storage and dummying up zip creation.