Code and copy cleanup