Fix #4. Running clear separately from upload