clean up some fixme.fi specificity