some cleanup; currently broken when distributed