Merge "Remove unused handover code." into main