Updated TODO with cleanup tasks