@@ -6,16 +6,4 @@
 
 class Screen extends ApiResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        $screen = parent::toArray($request);
-        $consolidator = new ScreenConsolidator($this);
-        return array_merge($screen, $consolidator->call());
-    }
 }
@@ -326,7 +326,6 @@ export default {
         custom_css: '',
         watchers: [],
       },
-      rendererKey: 0,
       self: this,
       watchers_config: {
         api: {
@@ -386,11 +385,6 @@ export default {
         this.previewData = {};
       }
     },
-    mode() {
-      if (this.mode === 'preview') {
-        this.getPreviewValues();
-      }
-    },
     customCSS(newCustomCSS) {
       this.preview.custom_css = newCustomCSS;
     }
@@ -463,16 +457,6 @@ export default {
         });
       }
     },
-    getPreviewValues() {
-      ProcessMaker.apiClient.post("/screens/preview", {
-          config: this.config,
-          computed: this.computed,
-          custom_css: this.customCSS,
-          watchers: this.watchers,
-      }).then(response => {
-        this.preview = response.data;
-      });
-    },
     changeMode(mode) {
       if (mode === "editor") {
         this.$refs.menuScreen.changeItem("button_design", {
@@ -493,9 +477,8 @@ export default {
         this.$refs.menuScreen.sectionRight = false;
       }
       this.mode = mode;
+      this.previewData = this.previewInputValid ? JSON.parse(this.previewInput) : {};
       if (mode == 'preview') {
-        this.previewData = this.previewInputValid ? JSON.parse(this.previewInput) : {};
-
         this.rendererKey++;
         this.preview.config = cloneDeep(this.config);
         this.preview.computed = cloneDeep(this.computed);
 
@@ -56,7 +56,6 @@
     Route::delete('screens/{screen}', 'ScreenController@destroy')->name('screens.destroy')->middleware('can:delete-screens');
     Route::post('screens/{screen}/export', 'ScreenController@export')->name('screens.export')->middleware('can:export-screens');
     Route::post('screens/import', 'ScreenController@import')->name('screens.import')->middleware('can:import-screens');
-    Route::post('screens/preview', 'ScreenController@preview')->name('screens.preview')->middleware('can:edit-screens');
 
     // Screen Categories
     Route::get('screen_categories', 'ScreenCategoryController@index')->name('screen_categories.index')->middleware('can:view-screen-categories');