Underp: Remove traces of Samsung RIL caused by a conflict