Merge "Removes recovery" into main