code-cleanup after commit a896f81102cfae98ee0d847dc9f1e8b5ef401462