Refactor the Upload route a little
Remove dead code