remove some TODOs that have been completed