major sample cleanup