removed old defintions