Merge "naming: Remove dead code"