Revert "class connecting behaviors"

This reverts commit b91a4c94b351c04a3127853532b6fe308a459e17.