Cleanup first pass