Merge "Remove unused variables/labels to eliminate compile warnings."