Many change to clean up file transfers