removed old legacy stuff