Touched things up, removed old unused data.