Please clean up this now unused if close in a subsequent CL