Merge "Remove duplicated code"