Remove dead code and eliminate confusion.