Cleanup

Removed some unused classes and functions as well as some old debug
prints.