More cleaning to figure out what should be changed