cleanup
Merge pull request #3431 from timoschilling/code_simplification

cleanup