Remove FIXME leftovers