Removed some TODOs and FIXMEs.