add cleanup ideas to TODO