Removing FIXME.