cleanup some TODOs