Correct guards.
Make message fatal.
Remove contrib material.