[copy] tidy up
Final clean up