redundant code now fully removed in syntax.c