cleanup
Merge pull request #1236 from jay-hodgson/uploader-cleanup

cleanup