some cleanup that hopefully didn't break anything.
i think we're good.  deprecated stuff deletoed.