removed some bm code