Move MAC removal responsibility to the various protocol "enc" functions