Revert "Ensure to cleanup properly in -disconnect & -dealloc - fixes crashes"

This reverts commit 9f1dc941ffe96d53d583d6d5aa8a921f675ba96f.