Remove the dependency toward core