Added automatic cleaning of data sets