With my last commit and comment as we don't return from Close, I think we don't need to return it anymore.