expanding cleanup