removed some more fixmes