Use joemasilotti's repo & remove BS dependency

* Temporary