Removed old code per CR