deprecated fields removed.

I think these are the fields that can go away.  Please verify.