More Cleanup

Cleaned up a lot of old stuff, simplified for the new structure and to
try to limit feature creep.