Clean up of some old code, removed some dead classes; removed TODOs