Re: [ENH] Undeclared cleanup