Refactor the GPX upload to try and avoid the import daemon loading traces