Removed usage of obsolete Riel code.