cleanups after merge of PR #739

Here some cleanups after merge of PR #739