removed all traces of B matrices