Remove RIL class and fix RIL