Removed more dead code and deps.