More simplifications of upload routes.