Add user removal before 'set', to clean up old location data