Updated form and removed custom archive-uploader
Cleanup and correctly configure

mutex locking removed for now