more Issue #172 cleanup