removed more misleading fixme comments