defer removing local uploads, fix types support