Remove resolved 'FIXME' comment