Merge "clean duplicated macro"