Issue #81 forgot to remove calls from _onconnect, it was late at night