removing some TODOs