Removed some more unnecessary stuff from when heartbeats were used