[HG] Cleaning up some old code.