removed fixmes