Merge "Remove dead code"