Clean up some resolved 'fixme's

Just removed some resolved *fixme's*  :)