Cleanup leftover from refactoring

Some things that I missed in the previous pull requests. Just a cleanup of stale classes, etc. Sorry for the double effort.