* Comitting some RCC cleanup code that was omitted from the previous push.