copy/paste cleanup