Clean-up and first pass