Changed user code to remove old system code calls not needed for MCN v2.0