RCS cleanup