some cleanup; more remains