Kill BGL and add safra consistency checker