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