Move all to fun-mode. Remove extraneous defs.