diff --git a/system/modules/isotope/dca/tl_module.php b/system/modules/isotope/dca/tl_module.php
index d17b6ccd61..24a4406e91 100755
--- a/system/modules/isotope/dca/tl_module.php
+++ b/system/modules/isotope/dca/tl_module.php
@@ -23,10 +23,10 @@
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_productreader']            = '{title_legend},name,headline,type;{config_legend},iso_use_quantity,iso_display404Page;{redirect_legend},iso_addProductJumpTo,iso_wishlistJumpTo;{template_legend:hide},customTpl,iso_reader_layout,iso_gallery,iso_disable_options,iso_includeMessages,iso_buttons;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_favorites']                = '{title_legend},name,headline,type;{config_legend},iso_moveFavorites;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages,iso_emptyMessage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_cart']                     = '{title_legend},name,headline,type;{redirect_legend},iso_cart_jumpTo,iso_checkout_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_continueShopping,iso_includeMessages,iso_emptyMessage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkout']                 = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutmember']           = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_addToAddressbook,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_login_jumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutguest']            = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutboth']             = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_addToAddressbook,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,tableless,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkout']                 = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutmember']           = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_addToAddressbook,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_login_jumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutguest']            = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_checkoutboth']             = '{title_legend},name,headline,type;{config_legend},iso_checkout_method,iso_payment_modules,iso_shipping_modules,iso_addToAddressbook,iso_notifications;{redirect_legend},iso_forward_review,iso_show_skipped,iso_checkout_skippable,orderCompleteJumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{iso_order_conditions_legend},iso_order_conditions;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_orderhistory']             = '{title_legend},name,headline,type;{config_legend},iso_config_ids,iso_orderdetails_module;{redirect_legend},jumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_orderdetails']             = '{title_legend},name,headline,type;{config_legend},iso_loginRequired;{redirect_legend:hide},iso_cart_jumpTo;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_wishlistmanager']          = '{title_legend},name,headline,type;{config_legend},iso_config_ids;{redirect_legend},jumpTo,iso_cart_jumpTo;{template_legend},customTpl,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
@@ -37,11 +37,11 @@
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_cumulativefilter']         = '{title_legend},name,headline,type;{config_legend},iso_category_scope,iso_list_where,iso_newFilter,iso_cumulativeFields,iso_filterHideSingle,iso_listingSortField,iso_listingSortDirection;{template_legend},customTpl,navigationTpl,iso_includeMessages,iso_hide_list;{redirect_legend},jumpTo;{reference_legend:hide},defineRoot;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_categoryfilter']           = '{title_legend},name,headline,type;{nav_legend},levelOffset,showLevel,showProtected,showHidden;{reference_legend:hide},defineRoot;{template_legend},customTpl,navigationTpl,iso_includeMessages,iso_hide_list;{redirect_legend},jumpTo;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_rangefilter']              = '{title_legend},name,headline,type;{config_legend},iso_category_scope,iso_list_where,iso_newFilter,iso_rangeFields;{template_legend},customTpl,navigationTpl,iso_includeMessages,iso_hide_list;{redirect_legend},jumpTo;{reference_legend:hide},defineRoot;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_addressbook']              = '{title_legend},name,headline,type;{config_legend},nc_notification;{template_legend},customTpl,memberTpl,tableless,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_addressbook']              = '{title_legend},name,headline,type;{config_legend},nc_notification;{template_legend},customTpl,memberTpl,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_relatedproducts']          = '{title_legend},name,headline,type;{config_legend},iso_related_categories,numberOfItems,perPage,iso_list_where,iso_newFilter,iso_listingSortField,iso_listingSortDirection;{redirect_legend},iso_addProductJumpTo;{template_legend:hide},customTpl,iso_list_layout,iso_gallery,iso_cols,iso_use_quantity,iso_disable_options,iso_includeMessages,iso_emptyMessage,iso_buttons;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_messages']                 = '{title_legend},name,headline,type;{template_legend},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_shipping_calculator']      = '{title_legend},name,headline,type;{config_legend},iso_shipping_modules;{template_legend:hide},customTpl,iso_emptyMessage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_cart_address']             = '{title_legend},name,headline,type;{config_legend},iso_address,iso_addressFields;{redirect_legend:hide},jumpTo;{template_legend:hide},memberTpl,tableless;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_cart_address']             = '{title_legend},name,headline,type;{config_legend},iso_address,iso_addressFields;{redirect_legend:hide},jumpTo;{template_legend:hide},memberTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_trustedshops']             = '{title_legend},name,headline,type;{config_legend},iso_tsid,iso_tsreviews,iso_tsdisplay,iso_tscheckout;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 
 
diff --git a/system/modules/isotope/library/Isotope/CheckoutStep/Address.php b/system/modules/isotope/library/Isotope/CheckoutStep/Address.php
index 5359c2a99c..c598d7332e 100644
--- a/system/modules/isotope/library/Isotope/CheckoutStep/Address.php
+++ b/system/modules/isotope/library/Isotope/CheckoutStep/Address.php
@@ -61,7 +61,6 @@ public function generate()
         $blnValidate = Input::post('FORM_SUBMIT') === $this->objModule->getFormId();
 
         $this->Template->class     = $this->getStepClass();
-        $this->Template->tableless = $this->objModule->tableless ?? true;
         $this->Template->options   = $this->generateOptions($blnValidate);
         $this->Template->fields    = $this->generateFields($blnValidate);
 
@@ -100,7 +99,6 @@ protected function generateOptions($blnValidate = false)
                     'value'       => $varValue,
                     'onclick'     => "Isotope.toggleAddressFields(this, '" . $this->getStepClass() . "_new');",
                     'storeValues' => true,
-                    'tableless'   => true,
                 ]
             );
 
@@ -312,7 +310,6 @@ protected function getWidgets()
 
                 $objWidget->mandatory   = $field['mandatory'] ? true : false;
                 $objWidget->required    = $objWidget->mandatory;
-                $objWidget->tableless   = $this->objModule->tableless ?? true;
                 $objWidget->storeValues = true;
                 $objWidget->dca_config  = $field['dca'];
 
diff --git a/system/modules/isotope/library/Isotope/CheckoutStep/BillingAddress.php b/system/modules/isotope/library/Isotope/CheckoutStep/BillingAddress.php
index a37a9501e5..e099e634bf 100644
--- a/system/modules/isotope/library/Isotope/CheckoutStep/BillingAddress.php
+++ b/system/modules/isotope/library/Isotope/CheckoutStep/BillingAddress.php
@@ -53,7 +53,6 @@ public function generate()
             Isotope::getCart()->setBillingAddress($address);
 
             $this->Template->class = $this->getStepClass();
-            $this->Template->tableless = $this->objModule->tableless ?? true;
             $this->Template->options = $address->generate();
             $this->Template->fields = '';
 
diff --git a/system/modules/isotope/library/Isotope/CheckoutStep/OrderConditions.php b/system/modules/isotope/library/Isotope/CheckoutStep/OrderConditions.php
index 51ef3974f0..bf6940c30b 100644
--- a/system/modules/isotope/library/Isotope/CheckoutStep/OrderConditions.php
+++ b/system/modules/isotope/library/Isotope/CheckoutStep/OrderConditions.php
@@ -67,10 +67,6 @@ public function generate()
             throw new \InvalidArgumentException('Order condition form "' . $this->formId . '" not found.');
         }
 
-        if (isset($objFormConfig->tableless)) {
-            $this->objForm->setTableless($objFormConfig->tableless);
-        }
-
         $this->objForm->addFieldsFromFormGenerator(
             $this->formId,
             function ($strName, &$arrDca) {
diff --git a/system/modules/isotope/library/Isotope/CheckoutStep/PaymentMethod.php b/system/modules/isotope/library/Isotope/CheckoutStep/PaymentMethod.php
index 35510b1991..142168ecad 100644
--- a/system/modules/isotope/library/Isotope/CheckoutStep/PaymentMethod.php
+++ b/system/modules/isotope/library/Isotope/CheckoutStep/PaymentMethod.php
@@ -102,7 +102,6 @@ public function generate()
             'options'       => $this->options,
             'value'         => Isotope::getCart()->payment_id,
             'storeValues'   => true,
-            'tableless'     => true,
         ));
 
         // If there is only one payment method, mark it as selected by default
diff --git a/system/modules/isotope/library/Isotope/CheckoutStep/ShippingMethod.php b/system/modules/isotope/library/Isotope/CheckoutStep/ShippingMethod.php
index c2919b5b05..731def9163 100644
--- a/system/modules/isotope/library/Isotope/CheckoutStep/ShippingMethod.php
+++ b/system/modules/isotope/library/Isotope/CheckoutStep/ShippingMethod.php
@@ -103,7 +103,6 @@ public function generate()
                 'options'     => $this->options,
                 'value'       => Isotope::getCart()->shipping_id,
                 'storeValues' => true,
-                'tableless'   => true,
             ]
         );
 
diff --git a/system/modules/isotope/library/Isotope/Model/Product/Standard.php b/system/modules/isotope/library/Isotope/Model/Product/Standard.php
index 8d4d860434..7493357866 100644
--- a/system/modules/isotope/library/Isotope/Model/Product/Standard.php
+++ b/system/modules/isotope/library/Isotope/Model/Product/Standard.php
@@ -777,7 +777,6 @@ protected function generateProductOptionWidget($strField, &$arrVariantOptions, &
         }
 
         $arrField['storeValues'] = true;
-        $arrField['tableless'] = true;
         $arrField['product'] = $this;
         $arrField['id'] .= '_' . $this->getFormId();
 
diff --git a/system/modules/isotope/library/Isotope/Module/AddressBook.php b/system/modules/isotope/library/Isotope/Module/AddressBook.php
index 4283b2c397..5b8bf6ac95 100755
--- a/system/modules/isotope/library/Isotope/Module/AddressBook.php
+++ b/system/modules/isotope/library/Isotope/Module/AddressBook.php
@@ -201,8 +201,7 @@ protected function edit($intAddressId = 0)
             'POST',
             function(Form $objForm) {
                 return Input::post('FORM_SUBMIT') === $objForm->getFormId();
-            },
-            isset($this->tableless) ? (bool) $this->tableless : true
+            }
         );
 
         $objForm->bindModel($objAddress);
diff --git a/system/modules/isotope/library/Isotope/Module/CartAddress.php b/system/modules/isotope/library/Isotope/Module/CartAddress.php
index 0218191948..d7c918312d 100644
--- a/system/modules/isotope/library/Isotope/Module/CartAddress.php
+++ b/system/modules/isotope/library/Isotope/Module/CartAddress.php
@@ -98,8 +98,7 @@ protected function compile()
             'POST',
             function(Form $objHaste) {
                 return Input::post('FORM_SUBMIT') === $objHaste->getFormId();
-            },
-            isset($this->tableless) ? (bool) $this->tableless : true
+            }
         );
 
         $objForm->bindModel($objAddress);
diff --git a/system/modules/isotope/library/Isotope/Upgrade/To0020010004.php b/system/modules/isotope/library/Isotope/Upgrade/To0020010004.php
deleted file mode 100644
index feb4322fa4..0000000000
--- a/system/modules/isotope/library/Isotope/Upgrade/To0020010004.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * Isotope eCommerce for Contao Open Source CMS
- *
- * Copyright (C) 2009 - 2019 terminal42 gmbh & Isotope eCommerce Workgroup
- *
- * @link       https://isotopeecommerce.org
- * @license    https://opensource.org/licenses/lgpl-3.0.html
- */
-
-namespace Isotope\Upgrade;
-
-use Contao\Database;
-use Contao\System;
-
-class To0020010004 extends System
-{
-
-    public function run($blnInstalled)
-    {
-        if ($blnInstalled
-            && Database::getInstance()->fieldExists('tableless', 'tl_module')
-            && Database::getInstance()->fieldExists('tableless', 'tl_form')
-        ) {
-
-            $objModules = Database::getInstance()->query("
-                SELECT iso_order_conditions, tableless FROM tl_module WHERE iso_order_conditions>0
-            ");
-
-            while ($objModules->next()) {
-                Database::getInstance()->prepare("UPDATE tl_form SET tableless=? WHERE id=?")->execute(
-                    $objModules->tableless,
-                    $objModules->iso_order_conditions
-                );
-            }
-        }
-    }
-}
diff --git a/system/modules/isotope/templates/checkout/iso_checkout_address.html5 b/system/modules/isotope/templates/checkout/iso_checkout_address.html5
index 8661a7e3bb..e0f09d0f15 100644
--- a/system/modules/isotope/templates/checkout/iso_checkout_address.html5
+++ b/system/modules/isotope/templates/checkout/iso_checkout_address.html5
@@ -4,12 +4,6 @@
 
 <?php if ($this->fields): ?>
 <div id="<?= $this->class ?>_new" class="address_new"<?php if($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
-<?php if($this->tableless): ?>
 <?= $this->fields ?>
-<?php else: ?>
-<table>
-<?= $this->fields ?>
-</table>
-<?php endif; ?>
 </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/system/modules/isotope/templates/checkout/iso_checkout_order_conditions.html5 b/system/modules/isotope/templates/checkout/iso_checkout_order_conditions.html5
index f9d891ce27..77f7ff4fb0 100644
--- a/system/modules/isotope/templates/checkout/iso_checkout_order_conditions.html5
+++ b/system/modules/isotope/templates/checkout/iso_checkout_order_conditions.html5
@@ -1,8 +1,2 @@
 <?= $this->hidden ?>
-<?php if (!$this->tableless): ?>
-<table>
-    <?= $this->fields ?>
-</table>
-<?php else: ?>
-<?= $this->fields ?>
-<?php endif; ?>
\ No newline at end of file
+<?= $this->fields ?>
\ No newline at end of file