Bi/pan cleanup