get rid of WBB classes
Revert "get rid of WBB classes"

This reverts commit 106591a49ef420140b4eb28b41d5d47e33f9a73c.