more copy cleanup; making space for future directions