Work/dead code

Alexander Lohnaurequested to merge
work/dead_code into master

Just some things I noticed when browsing through the codebase.

Merge request reports