UNAUTHORIZED is now either DOWNLOAD_UNAUTHORIZED or UPLOAD_UNAUTHORIZED, some cleaning up