code-cleanup after c6ad4a791dd836e38a4797376ea16084b41be813