removed more old definitions.