Merge "Remove duplicate and unused functions"