diff --git a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
index ab7feb5107..432e38011e 100644
--- a/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/enterprise_edition/enterprise_edition_left_panel.tsx
@@ -24,7 +24,6 @@ import useCanSelfHostedExpand from 'components/common/hooks/useCanSelfHostedExpa
 import {getExpandSeatsLink} from 'selectors/cloud';
 import useControlSelfHostedExpansionModal from 'components/common/hooks/useControlSelfHostedExpansionModal';
 import {useQuery} from 'utils/http_utils';
-import {STORAGE_KEY_EXPANSION_IN_PROGRESS} from 'components/self_hosted_purchases/constants';
 
 const DAYS_UNTIL_EXPIRY_WARNING_DISPLAY_THRESHOLD = 30;
 const DAYS_UNTIL_EXPIRY_DANGER_DISPLAY_THRESHOLD = 5;
@@ -66,9 +65,7 @@ const EnterpriseEditionLeftPanel = ({
     const actionQueryParam = query.get('action');
 
     useEffect(() => {
-        console.log(actionQueryParam);
         if (actionQueryParam === 'show_expansion_modal' && canExpand && isSelfHostedExpansionEnabled) {
-            console.log('Open modal!');
             selfHostedExpansionModal.open();
             query.set('action', '');
         }
diff --git a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
index 0661ad0637..83f6ff7320 100644
--- a/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
+++ b/webapp/channels/src/components/self_hosted_purchases/self_hosted_expansion_modal/index.tsx
@@ -356,98 +356,98 @@ export default function SelfHostedExpansionModal() {
                             <div className='footer-text'>{'Questions?'}</div>
                             <ContactSalesLink/>
                         </div>
-                            <div className='center'>
-                            <div
-                                    className='form'
-                                    data-testid='shpm-form'
-                                >
-                                    <span className='section-title'>
-                                    {intl.formatMessage({
+                        <div className='center'>
+                                <div
+                                className='form'
+                                data-testid='shpm-form'
+                            >
+                                <span className='section-title'>
+                                        {intl.formatMessage({
                                         id: 'payment_form.credit_card',
                                         defaultMessage: 'Credit Card',
                                     })}
-                                </span>
-                                    <div className='form-row'>
-                                    <CardInput
-                                            forwardedRef={cardRef}
-                                            required={true}
-                                            onCardInputChange={(event: StripeCardElementChangeEvent) => {
+                                    </span>
+                                <div className='form-row'>
+                                        <CardInput
+                                        forwardedRef={cardRef}
+                                        required={true}
+                                        onCardInputChange={(event: StripeCardElementChangeEvent) => {
                                             setFormState({...formState, cardFilled: event.complete});
                                         }}
-                                            theme={theme}
-                                        />
-                                </div>
-                                    <div className='form-row'>
-                                    <Input
-                                            name='organization'
-                                            type='text'
-                                            value={formState.organization}
-                                            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                                        theme={theme}
+                                    />
+                                    </div>
+                                <div className='form-row'>
+                                        <Input
+                                        name='organization'
+                                        type='text'
+                                        value={formState.organization}
+                                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                                             setFormState({...formState, organization: e.target.value});
                                         }}
-                                            placeholder={intl.formatMessage({
+                                        placeholder={intl.formatMessage({
                                             id: 'self_hosted_signup.organization',
                                             defaultMessage: 'Organization Name',
                                         })}
-                                            required={true}
-                                        />
-                                </div>
-                                    <div className='form-row'>
-                                    <Input
-                                            name='name'
-                                            type='text'
-                                            value={formState.cardName}
-                                            onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                                        required={true}
+                                    />
+                                    </div>
+                                <div className='form-row'>
+                                        <Input
+                                        name='name'
+                                        type='text'
+                                        value={formState.cardName}
+                                        onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                                             setFormState({...formState, cardName: e.target.value});
                                         }}
-                                            placeholder={intl.formatMessage({
+                                        placeholder={intl.formatMessage({
                                             id: 'payment_form.name_on_card',
                                             defaultMessage: 'Name on Card',
                                         })}
-                                            required={true}
-                                        />
-                                </div>
-                                    <span className='section-title'>
-                                    <FormattedMessage
-                                            id='payment_form.billing_address'
-                                            defaultMessage='Billing address'
-                                        />
-                                </span>
-                                    <Address
-                                    testPrefix='selfHostedExpansion'
-                                    type='billing'
-                                    country={formState.country}
-                                    changeCountry={(option) => {
+                                        required={true}
+                                    />
+                                    </div>
+                                <span className='section-title'>
+                                        <FormattedMessage
+                                        id='payment_form.billing_address'
+                                        defaultMessage='Billing address'
+                                    />
+                                    </span>
+                                <Address
+                                        testPrefix='selfHostedExpansion'
+                                        type='billing'
+                                        country={formState.country}
+                                        changeCountry={(option) => {
                                         setFormState({...formState, country: option.value});
                                     }}
-                                    address={formState.address}
-                                    changeAddress={(e) => {
+                                        address={formState.address}
+                                        changeAddress={(e) => {
                                         setFormState({...formState, address: e.target.value});
                                     }}
-                                    address2={formState.address2}
-                                    changeAddress2={(e) => {
+                                        address2={formState.address2}
+                                        changeAddress2={(e) => {
                                         setFormState({...formState, address2: e.target.value});
                                     }}
-                                    city={formState.city}
-                                    changeCity={(e) => {
+                                        city={formState.city}
+                                        changeCity={(e) => {
                                         setFormState({...formState, city: e.target.value});
                                     }}
-                                    state={formState.state}
-                                    changeState={(state: string) => {
+                                        state={formState.state}
+                                        changeState={(state: string) => {
                                         setFormState({...formState, state});
                                     }}
-                                    postalCode={formState.postalCode}
-                                    changePostalCode={(e) => {
+                                        postalCode={formState.postalCode}
+                                        changePostalCode={(e) => {
                                         setFormState({...formState, postalCode: e.target.value});
                                     }}
-                                />
-                                    <ChooseDifferentShipping
-                                    shippingIsSame={formState.shippingSame}
-                                    setShippingIsSame={(val: boolean) => {
+                                    />
+                                <ChooseDifferentShipping
+                                        shippingIsSame={formState.shippingSame}
+                                        setShippingIsSame={(val: boolean) => {
                                         setFormState({...formState, shippingSame: val});
                                     }}
-                                />
-                                    {!formState.shippingSame && (
+                                    />
+                                {!formState.shippingSame && (
                                     <>
                                         <div className='section-title'>
                                             <FormattedMessage
@@ -485,14 +485,14 @@ export default function SelfHostedExpansionModal() {
                                         />
                                     </>
                                 )}
-                                    <Terms
-                                    agreed={formState.agreedTerms}
-                                    setAgreed={(data: boolean) => {
+                                <Terms
+                                        agreed={formState.agreedTerms}
+                                        setAgreed={(data: boolean) => {
                                         setFormState({...formState, agreedTerms: data});
                                     }}
-                                />
-                                </div>
-                        </div>
+                                    />
+                            </div>
+                            </div>
                             <div className='rhs'>
                             <SelfHostedExpansionCard
                                     updateSeats={(seats: number) => {