Removed some unneeded cleanup code left over from previous attempts to fix the segfault-on-exit problem.