Did a huge cleanup