MCN v2.0 Changes

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