Remove references to dead code

There were some references to code that existed before the major
refactor.  I cleaned that up and now some parts should work.

I would say I am 1 solid day from completely flushing out the
functionality of this application and being done!