More cleanup; issue #30