Merge "Cleanup dead code from old all close prototype."