Merge "5/ Remove unused recents code" into main