Removed some TODOs