Tuto/FR: fix & remove useless parts.