Cleanup
Implementing pre upload queue for s3file, fixes #149