Merge "remove dead code."