Some todo closed