cleanup more todo's