Remove logs, dead code, and duplication.