removed fixmes.