More cleanups.
 -Erik
15 files changed