Ripping out non-RIC code