more todo removal