dist: Cleaned up some old stuff
Misc: More cleanups
Updated TODO