Removed uploader in more places
12factor and better micro copy