clean up some old FIXMEs