(Issue #3715) cleanup