General cleanup for RC.