[inm] code cleanup