Cleanup customer role snippet. #4