remove some more TODOS