Merge "Remove unused phonys"