clean up authentication and add uploader