More cleanups, solved some TODOs

Deleted some old code, removed/solved some TODOs