More cleanup. More getting rid of dead code.