removed old definitions