Cleanup and copy updates