Further removal of non-RIC code