diff --git a/src/components/ENSListPage/ENSListPage.container.ts b/src/components/ENSListPage/ENSListPage.container.ts
index 5a3ba041a..985cda506 100644
--- a/src/components/ENSListPage/ENSListPage.container.ts
+++ b/src/components/ENSListPage/ENSListPage.container.ts
@@ -9,7 +9,6 @@ import { FETCH_ENS_LIST_REQUEST } from 'modules/ens/actions'
 import { getLands, getLoading as getLandsLoading, getError as getLandsError } from 'modules/land/selectors'
 import { FETCH_LANDS_REQUEST } from 'modules/land/actions'
 import { getAvatar, getName } from 'modules/profile/selectors'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 import { openModal } from 'decentraland-dapps/dist/modules/modal/actions'
 import { MapStateProps, MapDispatchProps, MapDispatch } from './ENSListPage.types'
 import ENSListPage from './ENSListPage'
@@ -26,7 +25,6 @@ const mapState = (state: RootState): MapStateProps => ({
     isLoadingType(getLoading(state), FETCH_ENS_LIST_REQUEST) ||
     isLoggingIn(state),
   isLoggedIn: isLoggedIn(state),
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state),
   avatar: getAvatar(state)
 })
 
diff --git a/src/components/ENSListPage/ENSListPage.tsx b/src/components/ENSListPage/ENSListPage.tsx
index 7495685fe..307ca69de 100644
--- a/src/components/ENSListPage/ENSListPage.tsx
+++ b/src/components/ENSListPage/ENSListPage.tsx
@@ -1,22 +1,9 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import { config } from 'config'
-import {
-  Popup,
-  Button,
-  Table,
-  Row,
-  Column,
-  Header,
-  Section,
-  Container,
-  Pagination,
-  Dropdown,
-  Empty,
-  Icon as DCLIcon
-} from 'decentraland-ui'
+import { Popup, Button, Dropdown, Icon as DCLIcon } from 'decentraland-ui'
 import { TableContainer, TableContent } from 'decentraland-ui/dist/components/v2'
-import { T, t } from 'decentraland-dapps/dist/modules/translation/utils'
+import { t } from 'decentraland-dapps/dist/modules/translation/utils'
 import { DataTableType } from 'decentraland-ui/dist/components/v2/Table/TableContent/TableContent.types'
 import { shorten } from 'lib/address'
 import { locations } from 'routing/locations'
@@ -220,144 +207,6 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
     )
   }
 
-  renderEnsList() {
-    const { ensList, hasProfileCreated } = this.props
-    const { page } = this.state
-
-    const total = ensList.length
-    const totalPages = Math.ceil(total / PAGE_SIZE)
-    const paginatedItems = this.paginate()
-    return (
-      <>
-        <div className="filters">
-          <Container>
-            <Row>
-              <Column>
-                <Row>
-                  <Header sub className="items-count">
-                    {t('ens_list_page.items', { count: ensList.length.toLocaleString() })}
-                  </Header>
-                </Row>
-              </Column>
-              <Column align="right">
-                <Row>{ensList.length > 1 ? this.renderSortDropdown() : null}</Row>
-              </Column>
-            </Row>
-          </Container>
-        </div>
-        <Container>
-          <Section className="table-section">
-            {ensList.length > 0 ? (
-              <Table basic="very">
-                <Table.Header>
-                  <Table.Row>
-                    <Table.HeaderCell width="2">{t('ens_list_page.table.name')}</Table.HeaderCell>
-                    <Table.HeaderCell width="2">{t('ens_list_page.table.assigned_to')}</Table.HeaderCell>
-                    <Table.HeaderCell width="2">{t('ens_list_page.table.link')}</Table.HeaderCell>
-                    <Table.HeaderCell width="2"></Table.HeaderCell>
-                  </Table.Row>
-                </Table.Header>
-                <Table.Body>
-                  {paginatedItems.map((ens: ENS, index) => {
-                    return (
-                      <Table.Row className="TableRow" key={index}>
-                        <Table.Cell>
-                          <Row>
-                            <Column className="subdomain-wrapper">
-                              <div>{ens.name}</div>
-                              {this.isAlias(ens) ? (
-                                <Popup
-                                  content={t('ens_list_page.alias_popup')}
-                                  position="top center"
-                                  trigger={
-                                    <div>
-                                      <Icon name="profile" />
-                                    </div>
-                                  }
-                                  on="hover"
-                                />
-                              ) : null}
-                            </Column>
-                          </Row>
-                        </Table.Cell>
-                        <Table.Cell>
-                          <Row>
-                            <Column>{this.getAssignedToMessage(ens)}</Column>
-                          </Row>
-                        </Table.Cell>
-                        <Table.Cell>
-                          <Row>
-                            <Column className="link">
-                              {ens.landId ? (
-                                <a target="_blank" href={`https://${ens.subdomain}.${config.get('ENS_GATEWAY')}`} rel="noopener noreferrer">
-                                  {ens.subdomain} <Icon name="right-round-arrow" />
-                                </a>
-                              ) : null}
-                            </Column>
-                          </Row>
-                        </Table.Cell>
-                        <Table.Cell>
-                          <Row>
-                            {!this.isAlias(ens) ? (
-                              <Column align="right">
-                                <Popup
-                                  content={t('ens_list_page.not_profile_created')}
-                                  position="top center"
-                                  on="hover"
-                                  disabled={hasProfileCreated}
-                                  trigger={this.renderUseAsAliasButton(ens, hasProfileCreated)}
-                                />
-                              </Column>
-                            ) : null}
-                            {!ens.landId ? (
-                              <Column align="right">
-                                <Button className="ui basic button" onClick={() => this.handleAssignENS(ens)}>
-                                  {t('ens_list_page.button.assign')}
-                                </Button>
-                              </Column>
-                            ) : null}
-                            {ens.landId ? (
-                              <Column align="right">
-                                <Button className="ui basic button" onClick={() => this.handleAssignENS(ens)}>
-                                  {t('ens_list_page.button.edit')}
-                                </Button>
-                              </Column>
-                            ) : null}
-                          </Row>
-                        </Table.Cell>
-                      </Table.Row>
-                    )
-                  })}
-                </Table.Body>
-              </Table>
-            ) : (
-              <Empty className="empty-names" height={200}>
-                <div>
-                  <T
-                    id="ens_list_page.empty_names"
-                    values={{
-                      br: <br />,
-                      link: <a href={`${MARKETPLACE_WEB_URL}/names/claim`}>{t('global.click_here')}</a>
-                    }}
-                  />
-                </div>
-              </Empty>
-            )}
-            {totalPages > 1 && (
-              <Pagination
-                firstItem={null}
-                lastItem={null}
-                totalPages={totalPages}
-                activePage={page}
-                onPageChange={(_event, props) => this.setState({ page: +props.activePage! })}
-              />
-            )}
-          </Section>
-        </Container>
-      </>
-    )
-  }
-
   formatToTable(ensList: ENS[]): DataTableType[] {
     return ensList.map(ens => ({
       name: (
@@ -441,7 +290,7 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
     )
   }
 
-  renderNewEnsList() {
+  renderEnsList() {
     const { ensList } = this.props
     const { page } = this.state
 
@@ -509,7 +358,7 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { isLoading, isEnsAddressEnabled, error } = this.props
+    const { isLoading, error } = this.props
     return (
       <LoggedInDetailPage
         className="ENSListPage view"
@@ -518,7 +367,7 @@ export default class ENSListPage extends React.PureComponent<Props, State> {
         isLoading={isLoading}
         isPageFullscreen={true}
       >
-        {isEnsAddressEnabled ? this.renderNewEnsList() : this.renderEnsList()}
+        {this.renderEnsList()}
       </LoggedInDetailPage>
     )
   }
diff --git a/src/components/ENSListPage/ENSListPage.types.ts b/src/components/ENSListPage/ENSListPage.types.ts
index 8619f7ffd..e2959b9ef 100644
--- a/src/components/ENSListPage/ENSListPage.types.ts
+++ b/src/components/ENSListPage/ENSListPage.types.ts
@@ -18,7 +18,6 @@ export type Props = {
   hasProfileCreated: boolean
   isLoggedIn: boolean
   isLoading: boolean
-  isEnsAddressEnabled: boolean
   avatar: Avatar | null
   onNavigate: (path: string) => void
   onOpenModal: typeof openModal
@@ -31,7 +30,7 @@ export type State = {
 
 export type MapStateProps = Pick<
   Props,
-  'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn' | 'isEnsAddressEnabled' | 'avatar'
+  'address' | 'alias' | 'ensList' | 'lands' | 'hasProfileCreated' | 'isLoading' | 'error' | 'isLoggedIn' | 'avatar'
 >
 export type MapDispatchProps = Pick<Props, 'onNavigate' | 'onOpenModal'>
 export type MapDispatch = Dispatch
diff --git a/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.tsx b/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.tsx
index 2ee56fdee..2f2f20bcd 100644
--- a/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.tsx
+++ b/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.tsx
@@ -36,8 +36,7 @@ export default class LandAssignENSForm extends React.PureComponent<Props> {
   }
 
   render() {
-    const { ens, land, isLoading, isWaitingTxSetContent, isWaitingTxSetResolver, isWaitingTxReclaim, error, isEnsAddressEnabled } =
-      this.props
+    const { ens, land, isLoading, isWaitingTxSetContent, isWaitingTxSetResolver, isWaitingTxReclaim, error } = this.props
 
     const needsReclaiming = ens.ensOwnerAddress !== ens.nftOwnerAddress
     const hasResolver = !isResolverEmpty(ens) && ens.resolver.toLowerCase() === ENS_RESOLVER_ADDRESS.toLowerCase()
@@ -52,9 +51,7 @@ export default class LandAssignENSForm extends React.PureComponent<Props> {
 
     const setResolverButtonClassName = hasResolver && !isWaitingTxSetResolver && !hasResolverError ? 'grey-button' : ''
     const setContentButtonClassName = hasContent && !isWaitingTxSetContent && !hasContentError ? 'grey-button' : ''
-    const reclaimContentButtonClassName = !needsReclaiming && !isWaitingTxReclaim && !hasReclaimError ? 'grey-button' : ''
 
-    const isReclaimButtonDisabled = hasReclaimError || !needsReclaiming
     const isSetResolverButtonDisabled = hasResolverError || hasData || needsReclaiming || isWaitingTxSetResolver || isWaitingTxReclaim
     const isSetContentButtonDisabled =
       hasContentError ||
@@ -74,36 +71,6 @@ export default class LandAssignENSForm extends React.PureComponent<Props> {
             {t('land_assign_ens_page.set_name_message', { strong: (children: React.ReactElement) => <strong>{children}</strong> })}
           </p>
         </Row>
-        {!isEnsAddressEnabled ? (
-          <Row>
-            <div className={isReclaimButtonDisabled ? 'box box-disabled' : 'box'}>
-              <h3>{t('land_assign_ens_page.reclaim')}</h3>
-              <div className="message-box">
-                <p>{t('land_assign_ens_page.reclaim_explanation')}</p>
-                <NetworkButton
-                  type="submit"
-                  disabled={isReclaimButtonDisabled}
-                  onClick={this.handleReclaim}
-                  className={reclaimContentButtonClassName}
-                  loading={isWaitingTxReclaim}
-                  primary
-                  network={Network.ETHEREUM}
-                >
-                  {hasReclaimError ? (
-                    t('global.retry_tx')
-                  ) : !needsReclaiming ? (
-                    <>
-                      {t('global.approved_tx')}
-                      {!isWaitingTxReclaim ? <Icon name="check" /> : null}
-                    </>
-                  ) : (
-                    t('global.submit')
-                  )}
-                </NetworkButton>
-              </div>
-            </div>
-          </Row>
-        ) : null}
         <Row>
           <div className={isSetResolverButtonDisabled ? 'box box-disabled' : 'box'}>
             <h3>{t('land_assign_ens_page.set_resolver')}</h3>
diff --git a/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.types.ts b/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.types.ts
index 56917c355..cf56eb9b3 100644
--- a/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.types.ts
+++ b/src/components/LandAssignENSPage/LandAssignENSForm/LandAssignENSForm.types.ts
@@ -9,7 +9,6 @@ export type Props = {
   isWaitingTxSetResolver: boolean
   isWaitingTxReclaim: boolean
   error: ENSError | null
-  isEnsAddressEnabled: boolean
   onSetENSResolver: (ens: ENS) => void
   onSetENSContent: (ens: ENS, land: Land) => void
   onReclaimName: (ens: ENS) => void
diff --git a/src/components/LandAssignENSPage/LandAssignENSPage.container.ts b/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
index e13e65873..b5ef2af8e 100644
--- a/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
+++ b/src/components/LandAssignENSPage/LandAssignENSPage.container.ts
@@ -23,7 +23,6 @@ import {
 } from 'modules/ens/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './LandAssignENSPage.types'
 import LandAssignENSPage from './LandAssignENSPage'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { landId, subdomain } = ownProps.match.params
@@ -37,7 +36,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
     isWaitingTxSetResolver: isLoadingType(getLoading(state), SET_ENS_RESOLVER_REQUEST) || isWaitingTxSetResolver(state),
     isWaitingTxSetContent: isLoadingType(getLoading(state), SET_ENS_CONTENT_REQUEST) || isWaitingTxSetLandContent(state, landId),
     isWaitingTxReclaim: ens ? isReclaimingName(state, ens.subdomain) || isWaitingTxReclaim(state) : false,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     isLoading:
       isLoadingType(getLoading(state), SET_ENS_RESOLVER_REQUEST) ||
       isLoadingType(getLoading(state), SET_ENS_CONTENT_REQUEST) ||
diff --git a/src/components/LandAssignENSPage/LandAssignENSPage.tsx b/src/components/LandAssignENSPage/LandAssignENSPage.tsx
index fa4a6d50b..08cf4eb0c 100644
--- a/src/components/LandAssignENSPage/LandAssignENSPage.tsx
+++ b/src/components/LandAssignENSPage/LandAssignENSPage.tsx
@@ -21,7 +21,6 @@ export default class LandAssignENSPage extends React.PureComponent<Props> {
       isWaitingTxSetContent,
       isWaitingTxReclaim,
       isWaitingTxSetResolver,
-      isEnsAddressEnabled,
       onSetENSResolver,
       onSetENSContent,
       onReclaimName,
@@ -42,7 +41,6 @@ export default class LandAssignENSPage extends React.PureComponent<Props> {
               }
             >
               <LandAssignENSForm
-                isEnsAddressEnabled={isEnsAddressEnabled}
                 land={land}
                 ens={ens}
                 error={error}
diff --git a/src/components/LandAssignENSPage/LandAssignENSPage.types.ts b/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
index b71c3dcd3..fc2e496de 100644
--- a/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
+++ b/src/components/LandAssignENSPage/LandAssignENSPage.types.ts
@@ -23,7 +23,6 @@ export type Props = {
   isWaitingTxSetContent: boolean
   isWaitingTxSetResolver: boolean
   isWaitingTxReclaim: boolean
-  isEnsAddressEnabled: boolean
   onSetENSResolver: typeof setENSResolverRequest
   onSetENSContent: typeof setENSContentRequest
   onReclaimName: typeof reclaimNameRequest
@@ -33,7 +32,7 @@ export type Props = {
 
 export type MapStateProps = Pick<
   Props,
-  'ens' | 'isLoading' | 'error' | 'isWaitingTxSetContent' | 'isWaitingTxSetResolver' | 'isWaitingTxReclaim' | 'isEnsAddressEnabled'
+  'ens' | 'isLoading' | 'error' | 'isWaitingTxSetContent' | 'isWaitingTxSetResolver' | 'isWaitingTxReclaim'
 >
 export type MapDispatchProps = Pick<Props, 'onSetENSResolver' | 'onSetENSContent' | 'onReclaimName' | 'onBack' | 'onNavigate'>
 export type MapDispatch = Dispatch<
diff --git a/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.tsx b/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.tsx
index 941343c79..804763739 100644
--- a/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.tsx
+++ b/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Network } from '@dcl/schemas'
-import { Form, Row, Button, InputOnChangeData, Field } from 'decentraland-ui'
+import { Form, Row, Button, InputOnChangeData } from 'decentraland-ui'
 import { NetworkButton } from 'decentraland-dapps/dist/containers'
 import { t } from 'decentraland-dapps/dist/modules/translation/utils'
 import { AddressField } from 'decentraland-dapps/dist/components/AddressField'
@@ -52,7 +52,7 @@ export default class LandOperatorForm extends React.PureComponent<Props, State>
   }
 
   render() {
-    const { land, isEnsAddressEnabled } = this.props
+    const { land } = this.props
     const { address, loading, dirty, revoked, editing, initial } = this.state
 
     const isRevokable = editing && isEqual(address, initial)
@@ -73,34 +73,18 @@ export default class LandOperatorForm extends React.PureComponent<Props, State>
 
     return (
       <Form className="LandOperatorForm">
-        {isEnsAddressEnabled ? (
-          <AddressField
-            placeholder="0x..."
-            label={t('operator_page.address')}
-            className={classes.join(' ')}
-            value={address}
-            onChange={this.handleChange}
-            loading={loading}
-            action={isRevokable ? (revoked ? t('operator_page.undo') : t('operator_page.revoke')) : undefined}
-            onAction={isRevokable ? (revoked ? this.handleUndo : this.handleRevoke) : undefined}
-            error={hasError}
-            message={hasError ? t('operator_page.invalid_address') : undefined}
-          />
-        ) : (
-          <Field
-            placeholder="0x..."
-            label={t('operator_page.address')}
-            className={classes.join(' ')}
-            value={address}
-            onChange={this.handleChange}
-            loading={loading}
-            action={isRevokable ? (revoked ? t('operator_page.undo') : t('operator_page.revoke')) : undefined}
-            onAction={isRevokable ? (revoked ? this.handleUndo : this.handleRevoke) : undefined}
-            error={hasError}
-            message={hasError ? t('operator_page.invalid_address') : undefined}
-          />
-        )}
-
+        <AddressField
+          placeholder="0x..."
+          label={t('operator_page.address')}
+          className={classes.join(' ')}
+          value={address}
+          onChange={this.handleChange}
+          loading={loading}
+          action={isRevokable ? (revoked ? t('operator_page.undo') : t('operator_page.revoke')) : undefined}
+          onAction={isRevokable ? (revoked ? this.handleUndo : this.handleRevoke) : undefined}
+          error={hasError}
+          message={hasError ? t('operator_page.invalid_address') : undefined}
+        />
         <Row>
           <Link className="cancel" to={locations.landDetail(land.id)}>
             <Button>{t('global.cancel')}</Button>
diff --git a/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.types.ts b/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.types.ts
index d691e76fd..5525d536b 100644
--- a/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.types.ts
+++ b/src/components/LandOperatorPage/LandOperatorForm/LandOperatorForm.types.ts
@@ -2,7 +2,6 @@ import { Land } from 'modules/land/types'
 
 export type Props = {
   land: Land
-  isEnsAddressEnabled: boolean
   onSetOperator: (land: Land, address: string | null) => void
 }
 
diff --git a/src/components/LandOperatorPage/LandOperatorPage.container.ts b/src/components/LandOperatorPage/LandOperatorPage.container.ts
index 5e5db4ca3..ce22598e1 100644
--- a/src/components/LandOperatorPage/LandOperatorPage.container.ts
+++ b/src/components/LandOperatorPage/LandOperatorPage.container.ts
@@ -1,16 +1,10 @@
 import { connect } from 'react-redux'
 import { setOperatorRequest } from 'modules/land/actions'
-import { RootState } from 'modules/common/types'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 import LandOperatorPage from './LandOperatorPage'
-import { MapDispatchProps, MapDispatch, MapStateProps } from './LandOperatorPage.types'
-
-const mapState = (state: RootState): MapStateProps => ({
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state)
-})
+import { MapDispatchProps, MapDispatch } from './LandOperatorPage.types'
 
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
   onSetOperator: (land, address) => dispatch(setOperatorRequest(land, address))
 })
 
-export default connect(mapState, mapDispatch)(LandOperatorPage)
+export default connect(undefined, mapDispatch)(LandOperatorPage)
diff --git a/src/components/LandOperatorPage/LandOperatorPage.tsx b/src/components/LandOperatorPage/LandOperatorPage.tsx
index 3d1bc5d59..5cfa34281 100644
--- a/src/components/LandOperatorPage/LandOperatorPage.tsx
+++ b/src/components/LandOperatorPage/LandOperatorPage.tsx
@@ -7,7 +7,7 @@ import { Props } from './LandOperatorPage.types'
 
 export default class LandOperatorPage extends React.PureComponent<Props> {
   render() {
-    const { isEnsAddressEnabled, onSetOperator } = this.props
+    const { onSetOperator } = this.props
     return (
       <LandProviderPage>
         {land => (
@@ -25,7 +25,7 @@ export default class LandOperatorPage extends React.PureComponent<Props> {
               />
             }
           >
-            <LandOperatorForm land={land} onSetOperator={onSetOperator} isEnsAddressEnabled={isEnsAddressEnabled} />
+            <LandOperatorForm land={land} onSetOperator={onSetOperator} />
           </LandAction>
         )}
       </LandProviderPage>
diff --git a/src/components/LandOperatorPage/LandOperatorPage.types.ts b/src/components/LandOperatorPage/LandOperatorPage.types.ts
index 5826d7da2..f62d2b220 100644
--- a/src/components/LandOperatorPage/LandOperatorPage.types.ts
+++ b/src/components/LandOperatorPage/LandOperatorPage.types.ts
@@ -2,10 +2,8 @@ import { Dispatch } from 'redux'
 import { setOperatorRequest } from 'modules/land/actions'
 
 export type Props = {
-  isEnsAddressEnabled: boolean
   onSetOperator: typeof setOperatorRequest
 }
 
-export type MapStateProps = Pick<Props, 'isEnsAddressEnabled'>
 export type MapDispatchProps = Pick<Props, 'onSetOperator'>
 export type MapDispatch = Dispatch
diff --git a/src/components/LandTransferPage/LandTransferPage.container.ts b/src/components/LandTransferPage/LandTransferPage.container.ts
index b8e0441ab..d97f23304 100644
--- a/src/components/LandTransferPage/LandTransferPage.container.ts
+++ b/src/components/LandTransferPage/LandTransferPage.container.ts
@@ -1,16 +1,10 @@
 import { connect } from 'react-redux'
 import { transferLandRequest } from 'modules/land/actions'
-import { RootState } from 'modules/common/types'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
-import { MapDispatchProps, MapDispatch, MapStateProps } from './LandTransferPage.types'
+import { MapDispatchProps, MapDispatch } from './LandTransferPage.types'
 import LandTransferPage from './LandTransferPage'
 
-const mapState = (state: RootState): MapStateProps => ({
-  isEnsAddressEnabled: getIsEnsAddressEnabled(state)
-})
-
 const mapDispatch = (dispatch: MapDispatch): MapDispatchProps => ({
   onTransfer: (land, address) => dispatch(transferLandRequest(land, address))
 })
 
-export default connect(mapState, mapDispatch)(LandTransferPage)
+export default connect(undefined, mapDispatch)(LandTransferPage)
diff --git a/src/components/LandTransferPage/LandTransferPage.tsx b/src/components/LandTransferPage/LandTransferPage.tsx
index 22d1eeefb..37add23f9 100644
--- a/src/components/LandTransferPage/LandTransferPage.tsx
+++ b/src/components/LandTransferPage/LandTransferPage.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Link } from 'react-router-dom'
-import { Field, InputOnChangeData, Form, Row, Button, Section } from 'decentraland-ui'
+import { InputOnChangeData, Form, Row, Button, Section } from 'decentraland-ui'
 import { Network } from '@dcl/schemas'
 import { NetworkButton } from 'decentraland-dapps/dist/containers'
 import { T, t } from 'decentraland-dapps/dist/modules/translation/utils'
@@ -24,7 +24,7 @@ export default class LandTransferPage extends React.PureComponent<Props, State>
   }
 
   render() {
-    const { onTransfer, isEnsAddressEnabled } = this.props
+    const { onTransfer } = this.props
     const { address, isValid } = this.state
     return (
       <LandProviderPage className="LandTransferPage">
@@ -43,26 +43,14 @@ export default class LandTransferPage extends React.PureComponent<Props, State>
               subtitle={<T id="transfer_page.subtitle" values={{ name: <strong>{land.name}</strong> }} />}
             >
               <Form onSubmit={() => onTransfer(land, address)}>
-                {isEnsAddressEnabled ? (
-                  <AddressField
-                    label="Address"
-                    value={address}
-                    onChange={this.handleChange}
-                    placeholder="0x..."
-                    error={!isValid || isOwner}
-                    message={message}
-                  />
-                ) : (
-                  <Field
-                    label="Address"
-                    type="address"
-                    value={address}
-                    onChange={this.handleChange}
-                    placeholder="0x..."
-                    error={!isValid || isOwner}
-                    message={message}
-                  />
-                )}
+                <AddressField
+                  label="Address"
+                  value={address}
+                  onChange={this.handleChange}
+                  placeholder="0x..."
+                  error={!isValid || isOwner}
+                  message={message}
+                />
                 <Section className="disclaimer">
                   <p className="danger-text">
                     <T id="transfer_page.disclaimer" values={{ br: <br /> }} />
diff --git a/src/components/LandTransferPage/LandTransferPage.types.ts b/src/components/LandTransferPage/LandTransferPage.types.ts
index b39344922..18a2ccd00 100644
--- a/src/components/LandTransferPage/LandTransferPage.types.ts
+++ b/src/components/LandTransferPage/LandTransferPage.types.ts
@@ -2,7 +2,6 @@ import { transferLandRequest, TransferLandRequestAction } from 'modules/land/act
 import { Dispatch } from 'redux'
 
 export type Props = {
-  isEnsAddressEnabled: boolean
   onTransfer: typeof transferLandRequest
 }
 
@@ -11,6 +10,5 @@ export type State = {
   isValid: boolean
 }
 
-export type MapStateProps = Pick<Props, 'isEnsAddressEnabled'>
 export type MapDispatchProps = Pick<Props, 'onTransfer'>
 export type MapDispatch = Dispatch<TransferLandRequestAction>
diff --git a/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.tsx b/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.tsx
index 2cc43a59e..6654aa9b7 100644
--- a/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.tsx
+++ b/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.tsx
@@ -1,9 +1,8 @@
 import * as React from 'react'
-import { Form, Field, Button, InputOnChangeData } from 'decentraland-ui'
+import { Form, Button, InputOnChangeData } from 'decentraland-ui'
 import { t } from 'decentraland-dapps/dist/modules/translation/utils'
 import { AddressField } from 'decentraland-dapps/dist/components/AddressField'
 
-import { isValid } from 'lib/address'
 import { Props, State } from './EmptyRole.types'
 import './EmptyRole.css'
 
@@ -30,22 +29,9 @@ export default class EmptyRole extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { isEnsAddressEnabled } = this.props
-    const { address } = this.state
     return (
       <Form className="EmptyRole" onSubmit={this.handleAdd}>
-        {isEnsAddressEnabled ? (
-          <AddressField className="rounded-address" fieldClassName="rounded" onChange={this.handleChange} placeholder="0x..." />
-        ) : (
-          <Field
-            className="rounded"
-            type="address"
-            value={address}
-            onChange={this.handleChange}
-            placeholder="0x..."
-            error={!!address && !isValid(address)}
-          />
-        )}
+        <AddressField className="rounded-address" fieldClassName="rounded" onChange={this.handleChange} placeholder="0x..." />
         <Button basic className="action link">
           {t('global.add')}
         </Button>
diff --git a/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.types.ts b/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.types.ts
index facaf69b7..9e79215e6 100644
--- a/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.types.ts
+++ b/src/components/Modals/ManageCollectionRoleModal/EmptyRole/EmptyRole.types.ts
@@ -1,5 +1,4 @@
 export type Props = {
-  isEnsAddressEnabled: boolean
   onAdd: (address: string) => void
   onCancel: () => void
 }
diff --git a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
index 96d31bd03..b5e6be29e 100644
--- a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
+++ b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.container.ts
@@ -11,7 +11,6 @@ import {
 import { getCollection, getLoading } from 'modules/collection/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './ManageCollectionRoleModal.types'
 import ManageCollectionRoleModal from './ManageCollectionRoleModal'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { collectionId } = ownProps.metadata
@@ -23,7 +22,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   return {
     wallet: getWallet(state)!,
     collection: getCollection(state, collectionId)!,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     isLoading:
       isLoadingType(getLoading(state), SET_COLLECTION_MANAGERS_REQUEST) || isLoadingType(getLoading(state), SET_COLLECTION_MINTERS_REQUEST)
   }
diff --git a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.tsx b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.tsx
index 10a991890..5ba283232 100644
--- a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.tsx
+++ b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.tsx
@@ -108,7 +108,7 @@ export default class ManageCollectionRoleModal extends React.PureComponent<Props
   }
 
   render() {
-    const { metadata, isLoading, isEnsAddressEnabled, onClose } = this.props
+    const { metadata, isLoading, onClose } = this.props
     const { roles } = this.state
     const { type } = metadata
 
@@ -132,7 +132,6 @@ export default class ManageCollectionRoleModal extends React.PureComponent<Props
                         key={index}
                         onAdd={(role: string) => this.handleAddRole(index, role)}
                         onCancel={() => this.handleCancelNew(index)}
-                        isEnsAddressEnabled={isEnsAddressEnabled}
                       />
                     )
                   )}
diff --git a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
index f2f501d55..96b270a96 100644
--- a/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
+++ b/src/components/Modals/ManageCollectionRoleModal/ManageCollectionRoleModal.types.ts
@@ -14,7 +14,6 @@ export type Props = Omit<ModalProps, 'metadata'> & {
   wallet: Wallet
   collection: Collection
   isLoading: boolean
-  isEnsAddressEnabled: boolean
   onSetManagers: typeof setCollectionManagersRequest
   onSetMinters: typeof setCollectionMintersRequest
 }
@@ -29,7 +28,7 @@ export type ManageCollectionRoleModalMetadata = {
   roles: string[]
 }
 
-export type MapStateProps = Pick<Props, 'wallet' | 'collection' | 'isLoading' | 'isEnsAddressEnabled'>
+export type MapStateProps = Pick<Props, 'wallet' | 'collection' | 'isLoading'>
 export type MapDispatchProps = Pick<Props, 'onSetManagers' | 'onSetMinters'>
 export type MapDispatch = Dispatch<SetCollectionManagersRequestAction | SetCollectionMintersRequestAction>
 export type OwnProps = Pick<Props, 'metadata'>
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.container.ts b/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
index a40919489..21bb09c4c 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.container.ts
@@ -11,7 +11,6 @@ import { canMintItem, UNSYNCED_STATES } from 'modules/item/utils'
 import { getAuthorizedItems, getStatusByItemId } from 'modules/item/selectors'
 import { MapStateProps, MapDispatchProps, MapDispatch, OwnProps } from './MintItemsModal.types'
 import MintItemsModal from './MintItemsModal'
-import { getIsEnsAddressEnabled } from 'modules/features/selectors'
 
 const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
   const { itemIds } = ownProps.metadata
@@ -45,7 +44,6 @@ const mapState = (state: RootState, ownProps: OwnProps): MapStateProps => {
     ethAddress,
     collection,
     totalCollectionItems,
-    isEnsAddressEnabled: getIsEnsAddressEnabled(state),
     hasUnsyncedItems
   }
 }
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.tsx b/src/components/Modals/MintItemsModal/MintItemsModal.tsx
index 8f5544539..41dec3449 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.tsx
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.tsx
@@ -93,7 +93,7 @@ export default class MintItemsModal extends React.PureComponent<Props, State> {
   handleView = (newConfirmState: View) => this.setState({ confirm: newConfirmState })
 
   render() {
-    const { collection, totalCollectionItems, isLoading, isEnsAddressEnabled, hasUnsyncedItems, onClose } = this.props
+    const { collection, totalCollectionItems, isLoading, hasUnsyncedItems, onClose } = this.props
     const { itemMints, error, confirm } = this.state
 
     const items = this.props.items.concat(this.state.items)
@@ -195,15 +195,7 @@ export default class MintItemsModal extends React.PureComponent<Props, State> {
               {isEmpty ? (
                 <div className="empty">{t('mint_items_modal.no_items', { name: collection.name })}</div>
               ) : (
-                items.map(item => (
-                  <MintableItem
-                    key={item.id}
-                    item={item}
-                    mints={itemMints[item.id]}
-                    onChange={this.handleMintsChange}
-                    isEnsAddressEnabled={isEnsAddressEnabled}
-                  />
-                ))
+                items.map(item => <MintableItem key={item.id} item={item} mints={itemMints[item.id]} onChange={this.handleMintsChange} />)
               )}
               {isFull ? null : (
                 <ItemDropdown placeholder={t('mint_items_modal.add_item')} onChange={this.handleAddItems} filter={filterAddableItems} />
diff --git a/src/components/Modals/MintItemsModal/MintItemsModal.types.ts b/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
index 8eb68c056..f4c056026 100644
--- a/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
+++ b/src/components/Modals/MintItemsModal/MintItemsModal.types.ts
@@ -35,10 +35,7 @@ export type State = {
   confirm: View
 }
 
-export type MapStateProps = Pick<
-  Props,
-  'ethAddress' | 'collection' | 'items' | 'totalCollectionItems' | 'isLoading' | 'hasUnsyncedItems' | 'isEnsAddressEnabled'
->
+export type MapStateProps = Pick<Props, 'ethAddress' | 'collection' | 'items' | 'totalCollectionItems' | 'isLoading' | 'hasUnsyncedItems'>
 export type MapDispatchProps = Pick<Props, 'onMint'>
 export type MapDispatch = Dispatch<MintCollectionItemsRequestAction>
 export type OwnProps = Pick<Props, 'metadata'>
diff --git a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
index a7a442bd7..a177891b9 100644
--- a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
+++ b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.tsx
@@ -79,7 +79,7 @@ export default class MintableItem extends React.PureComponent<Props> {
   }
 
   render() {
-    const { item, mints, isEnsAddressEnabled } = this.props
+    const { item, mints } = this.props
 
     return (
       <div className="MintableItem">
@@ -103,24 +103,12 @@ export default class MintableItem extends React.PureComponent<Props> {
         </Row>
         {mints.map(({ address, amount }, index) => (
           <Section key={index} className="mint" size="tiny">
-            {isEnsAddressEnabled ? (
-              <AddressField
-                value={address}
-                className="rounded-address"
-                fieldClassName="rounded"
-                onChange={this.getChangeAddressHandler(index)}
-              />
-            ) : (
-              <Field
-                className="rounded"
-                type="address"
-                placeholder={t('global.address')}
-                value={address || ''}
-                message={undefined}
-                error={!this.isValidAddress(address)}
-                onChange={this.getChangeAddressHandler(index)}
-              />
-            )}
+            <AddressField
+              value={address}
+              className="rounded-address"
+              fieldClassName="rounded"
+              onChange={this.getChangeAddressHandler(index)}
+            />
             <Field
               className="rounded"
               type="number"
diff --git a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
index c099ffced..0097dff16 100644
--- a/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
+++ b/src/components/Modals/MintItemsModal/MintableItem/MintableItem.types.ts
@@ -4,6 +4,5 @@ import { Mint } from 'modules/collection/types'
 export type Props = {
   item: Item
   mints: Partial<Mint>[]
-  isEnsAddressEnabled: boolean
   onChange: (item: Item, mints: Partial<Mint>[]) => void
 }
diff --git a/src/modules/features/selectors.spec.ts b/src/modules/features/selectors.spec.ts
index 2452d9a7d..29c985a62 100644
--- a/src/modules/features/selectors.spec.ts
+++ b/src/modules/features/selectors.spec.ts
@@ -1,7 +1,7 @@
 import { getIsFeatureEnabled } from 'decentraland-dapps/dist/modules/features/selectors'
 import { ApplicationName } from 'decentraland-dapps/dist/modules/features/types'
 import { RootState } from 'modules/common/types'
-import { getIsCreateSceneOnlySDK7Enabled, getIsMaintenanceEnabled, getIsSDK7TemplatesEnabled, getIsEnsAddressEnabled } from './selectors'
+import { getIsCreateSceneOnlySDK7Enabled, getIsMaintenanceEnabled, getIsSDK7TemplatesEnabled } from './selectors'
 import { FeatureName } from './types'
 
 jest.mock('decentraland-dapps/dist/modules/features/selectors')
@@ -55,8 +55,7 @@ describe('when getting if maintainance is enabled', () => {
 
 const ffSelectors = [
   { selector: getIsSDK7TemplatesEnabled, app: ApplicationName.BUILDER, feature: FeatureName.SDK7_TEMPLATES },
-  { selector: getIsCreateSceneOnlySDK7Enabled, app: ApplicationName.BUILDER, feature: FeatureName.CREATE_SCENE_ONLY_SDK7 },
-  { selector: getIsEnsAddressEnabled, app: ApplicationName.DAPPS, feature: FeatureName.ENS_ADDRESS }
+  { selector: getIsCreateSceneOnlySDK7Enabled, app: ApplicationName.BUILDER, feature: FeatureName.CREATE_SCENE_ONLY_SDK7 }
 ]
 
 ffSelectors.forEach(({ selector, app, feature }) => {
diff --git a/src/modules/features/selectors.ts b/src/modules/features/selectors.ts
index cfa2cd61d..f13f674f0 100644
--- a/src/modules/features/selectors.ts
+++ b/src/modules/features/selectors.ts
@@ -37,11 +37,3 @@ export const getIsCreateSceneOnlySDK7Enabled = (state: RootState) => {
     return false
   }
 }
-
-export const getIsEnsAddressEnabled = (state: RootState) => {
-  try {
-    return getIsFeatureEnabled(state, ApplicationName.DAPPS, FeatureName.ENS_ADDRESS)
-  } catch (e) {
-    return false
-  }
-}