Refactor: removing unused code and bits left over from building fileUpload, removing comments, reorganizing and renaming things before moving forward