Remove redundancy in UMD