Run cleanup based on heartbeat

 - Cleanup runs based on heartbeat, rather than client pings.