Remove
Remove
Touches ups

I just need the last bit masks and xxx_m messages at the end of the
code.