Merge "remove duplicate code"