Pruned older stuff from TODO list so that its easier to follow