Feature/data cleanup