removed yet more old definitions.