Merge "Remove duplicate code"