Revert "BFS work - soon to remove"

This reverts commit e9e409883da88784a0b0b9019cd8c50b265edc99.