Remove Core references