Remove all references to non-existent bms