removed some TODOs