Remove dead code

[Benjamin-Nussbaum]

The best way to check what code is probably test coverage. We need to expand testing to cover all use-cases we want to support.