fixmes were unneeded