Updating patch saving to remove connections properly