More cleanup. Still compiles and runs.