Cleanup copy/paste