Merge "Remove doubled-code"