Remove out-commented code

[loeiten]

The repository contains out-commented code several places.

I suggest to either remove it in the case where it is no longer needed, make it part of an input parameter where it is meant as a switch or make a docstring comment in the case why the left-over code is part of a worse choice than used in the current code.