removed old code