More clean-up stuff. it's amazing how many I don't see on the first few
times through the code!