tweak the cleanup and location update tasks further