Clean-up following PR #1949
2 files changed