Eliminate another HEAD, clean up core