Merge "Remove duplicated code in IMMS"