Small maintenance tasks

Small things that don't deserve their own PR.

Removed some more unused files and renamed a class to match the python version.