More cleanup; caveats.