Did a bit of cleaning up: removed redundant classes, interfaces, and
debug code.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>