removed old code commented out