remove todos that are done; code clean up