fixes 'disconnect' variable name
added explicit 'remove_on_disconnect' method