Update disconnect methods to use new onDisconnect() class