remove some TODOs and FIXMEs.