cleanup; no effective changes