Removed commented out code and changed heartbeat to 15s