removes some TODOs