Merge "Remove redundancy file and do relative modification"