remove code, fix heartbeat