reduce logging
Fix wrong object being injected
Unify disconnect logic