Stripped out the old tap-to-server upload events