Strip out all remnants of the old open/close code.