Removed old core cpp implementation