Cleans up more old stuff. Segfault is still a problem.