Remove commented out code for heartbeat