remove handover validation