add removing of todos
cleanup