Cleanup after rebasing to new context manager