Merge "Remove useless code."