Updated TODO - removed old/complete entries