missed: change some comments from TODO to CLEANUP