Fixed comments, removed more dead code.