Remove unused code.
Clean up a bit. CDO startup/shutdown behaves better.