removing BB for now just flux for now
Merge branch 'develop'