One final cleanup against self.cleanup()