Move some TODOs