removing dependency of b2safe core