Index: in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl
===================================================================
diff -u -N
--- in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(revision 12930)
+++ in-commerce/elements/content_boxes/checkout/billing_address.elm.tpl	(revision 0)
@@ -1,64 +0,0 @@
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_comm_BillingInfo"/>
-	</inp2:m_Capture>
-
-	<inp2:ord_ShowDefaultAddress type="billing"/>
-
-	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
-
-	<inp2:m_Phrase label="lu_EnterBillingAddress"/><br /><br />
-
-	<inp2:m_if check="ord_HasError" field="any">
-		<inp2:m_RenderElement name="error_message" />
-	</inp2:m_if>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-	<table class="form-data fullwidth">
-		<inp2:m_include template="in-commerce/elements/addresses.elm"/>
-
-		<inp2:m_if check="ord_OrderHasTangibleItems">
-			<inp2:m_if check="m_LoggedIn"><inp2:m_else/>
-				<tr>
-					<td class="field-name"><inp2:m_Phrase label="lu_SameAsShipping"/>:</td>
-					<td class="field-value">
-						<input type="checkbox" name="same_address" onclick="document.getElementById('events[ord][OnUpdate]').click();" value="1"<inp2:m_if check="m_GetEquals" name="same_address" value="1"> checked</inp2:m_if>" />
-					</td>
-				</tr>
-			</inp2:m_if>
-		</inp2:m_if>
-
-		<inp2:m_if check="m_LoggedIn">
-			<inp2:m_RenderElement name="inp_edit_select_address" type="billing" title="lu_fld_SelectAddress"/>
-		</inp2:m_if>
-
-		<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingTo" title="lu_fld_FullName"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCity" title="lu_fld_City"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingState" title="lu_fld_State"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingZip" title="lu_fld_Zip"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingCountry" title="lu_fld_Country"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
-		<inp2:m_else/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="lu_fld_FullName" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress1" title="lu_fld_AddressLine1" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingAddress2" title="lu_fld_AddressLine2" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingState" title="lu_fld_State" style="width: 200px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" style="width: 100px;" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" style="width: 300px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone" style="width: 150px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
-		</inp2:m_if>
-
-		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
-			<input type="hidden" name="check_billing_address" value="true"/>
-			<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_UpdateAddress" no_editing="1"/>"/>
-		</inp2:m_RenderElement>
-	</table>
-</inp2:m_RenderElement>
\ No newline at end of file