remove some fixed todos