dead code removal
Merge pull request #2111 from opf/fix/dead_code_removal

dead code removal