Revert "Add the concept of jabber sub-protocols"
This reverts commit 7733b8c95abbac26f5cbf02a9874a9d96c23bf0d.