#27 clean up garbage in code from recent refactoring
Closed: Fixed Opened by tflink.

There's still a bunch of garbage left over from the recent refactor. remove the cruft before we release


Metadata