Removed discovery, too buggy. Solved connection problems with proper disconnection in lifecycels