ch ch ch changes

[martygreene]

done a bit more paring down.

getting ready for what will hopefully be some beneficial changes.