Fix some TODOs and remove some others