removed old definitions.