Merge "Remove unnecessary code."