remove commad wrappers from protocol