removed bunches o' junk
more spring cleaning
more junk gotten rid of
more cleanup
model cleanup
more cleanups
merged in carolines fixes to phils cleanups