Remove Bjy as dependency