Final phase clean up