removed old core implementation