fine tune cleanup