More rconfig cleanup