more Protocol shuffling as prep for cleanup