Much cleanup; much more needed