Final cleanup for upload sample