did some copy cleanups