Get rid of unneeded ListenForUpdate