remove some finished TODO