Sweeping in oil and non-oil environments