#34 Remove obsolete RI class