fixes #850 Remove dead code