More cleaning, getting close!