The BIG cleanup for separating sare.