Dead code cleanup

Found a bunch of dead code, aided by the vulture tool after the first bit. I'm fairly sure it's just code which was left-over when things were removed.

I also cleaned up some annotations, as vulture doesn't like string type annotations (while python 3.7 supports using annotations before they've been defined via __future__).

Plus, there was a bug related to some code which should have been used.