removes dead code
Merge pull request #129 from Schlaefer/feature/remove-dead-code

[TASK] removes dead code