porting e73983649f776315dd39916fa8b6d1236eaf1e7d :: Ban cleanup