Code cleanup, remove check for heartbeat