diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php
index 80ea8e07..3e4edc3a 100644
--- a/includes/admin/class-enqueue.php
+++ b/includes/admin/class-enqueue.php
@@ -553,8 +553,12 @@ final class Enqueue extends \um\common\Enqueue {
 			wp_enqueue_style( 'um_admin_common' );
 
 			if ( self::$um_cpt_form_screen ) {
-				$this->load_builder();
-				$this->load_modal();
+				if ( defined( 'UM_LEGACY_BUILDER_OFF' ) && UM_LEGACY_BUILDER_OFF ) {
+					// Do new assets.
+				} else {
+					$this->load_builder();
+					$this->load_modal();
+				}
 			}
 
 			$this->load_forms();
diff --git a/includes/admin/core/class-admin-metabox.php b/includes/admin/core/class-admin-metabox.php
index a5556ec5..948ebd5d 100644
--- a/includes/admin/core/class-admin-metabox.php
+++ b/includes/admin/core/class-admin-metabox.php
@@ -188,15 +188,13 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 		/**
 		 * Init the metaboxes
 		 */
-		function add_metabox() {
+		public function add_metabox() {
 			global $current_screen;
 
-			if ( $current_screen->id == 'um_form' ) {
+			if ( 'um_form' === $current_screen->id ) {
 				add_action( 'add_meta_boxes', array( &$this, 'add_metabox_form' ), 1 );
 				add_action( 'save_post', array( &$this, 'save_metabox_form' ), 10, 2 );
-			}
-
-			if ( $current_screen->id == 'um_directory' ) {
+			} elseif ( 'um_directory' === $current_screen->id ) {
 				add_action( 'add_meta_boxes', array( &$this, 'add_metabox_directory' ), 1 );
 				add_action( 'save_post', array( &$this, 'save_metabox_directory' ), 10, 2 );
 			}
@@ -857,7 +855,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 		 * Add directory metabox
 		 */
 		public function add_metabox_directory() {
-			add_meta_box('submitdiv', __( 'Publish', 'ultimate-member' ), array( &$this, 'custom_submitdiv' ), 'um_directory', 'side', 'high' );
+			add_meta_box( 'submitdiv', __( 'Publish', 'ultimate-member' ), array( &$this, 'custom_submitdiv' ), 'um_directory', 'side', 'high' );
 			add_meta_box( 'um-admin-form-general', __( 'General Options', 'ultimate-member' ), array( &$this, 'load_metabox_directory' ), 'um_directory', 'normal', 'default' );
 			add_meta_box( 'um-admin-form-sorting', __( 'Sorting', 'ultimate-member' ), array( &$this, 'load_metabox_directory' ), 'um_directory', 'normal', 'default' );
 			add_meta_box( 'um-admin-form-profile', __( 'Profile Card', 'ultimate-member' ), array( &$this, 'load_metabox_directory' ), 'um_directory', 'normal', 'default' );
@@ -1017,16 +1015,19 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 			}
 		}
 
-
 		/**
 		 * Add form metabox
 		 */
 		public function add_metabox_form() {
-
 			add_meta_box( 'submitdiv', __( 'Publish', 'ultimate-member' ), array( $this, 'custom_submitdiv' ), 'um_form', 'side', 'high' );
 
-			add_meta_box( 'um-admin-form-mode', __( 'Select Form Type', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'normal', 'default' );
-			add_meta_box( 'um-admin-form-builder', __( 'Form Builder', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'normal', 'default' );
+			if ( defined( 'UM_LEGACY_BUILDER_OFF' ) && UM_LEGACY_BUILDER_OFF ) {
+				// Do new metabox.
+			} else {
+				add_meta_box( 'um-admin-form-mode', __( 'Select Form Type', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'normal', 'default' );
+				add_meta_box( 'um-admin-form-builder', __( 'Form Builder', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'normal', 'default' );
+			}
+
 			add_meta_box( 'um-admin-form-shortcode', __( 'Shortcode', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'side', 'default' );
 
 			add_meta_box( 'um-admin-form-register_customize', __( 'Customize this form', 'ultimate-member' ), array( &$this, 'load_metabox_form' ), 'um_form', 'side', 'default' );
diff --git a/ultimate-member.php b/ultimate-member.php
index 3f5481d5..bf70d9f8 100644
--- a/ultimate-member.php
+++ b/ultimate-member.php
@@ -32,6 +32,7 @@ define( 'UM_PATH', plugin_dir_path( __FILE__ ) );
 define( 'UM_PLUGIN', plugin_basename( __FILE__ ) );
 define( 'UM_VERSION', $plugin_data['Version'] );
 define( 'UM_PLUGIN_NAME', $plugin_data['Name'] );
+// define( 'UM_LEGACY_BUILDER_OFF', true );
 
 require_once 'includes/class-functions.php';
 require_once 'includes/class-init.php';