Another clear out...
Another big commit. Just ship it baby.