Remove dead code

Leftovers from testing and evolving logic.