code cleanups and further deprecation fixes

Original commit message from CVS:
code cleanups and further deprecation fixes
43 files changed