removed old code path