Clean up protocol wonkiness