Merge "Remove unnecessary name definitions"