diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index a391630b..f7ae5fd4 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -57,9 +57,7 @@
                The Notice of Joint Family Claim Form (F1) is a document that
                starts the court file for your divorce. It states the grounds
                for the divorce and gives information about you and your spouse,
-               as well as the details about your
-               {% if married_marriage_like == 'Legally married' %}marriage
-               {% else %}relationship{% endif %} and separation.
+               as well as the details about your marriage and separation.
            </p>
        </div>
     </div>
@@ -263,8 +261,6 @@
 </div>
 {% endif %}
 
-
-{% if married_marriage_like == 'Legally married' %}
 <div class="review-well clearfix">
     <div class="collapse-trigger collapsed" data-toggle="collapse"
          aria-expanded="false" data-target="#collapseF38"
@@ -346,41 +342,7 @@
     </p>
     <div class="clearfix"> </div>
 </div>
-{% else %}
-{% comment %}{# common law use case removed in DIV-495 #}
-<div class="review-well clearfix">
-    <div class="collapse-trigger collapsed" data-toggle="collapse"
-         aria-expanded="false" data-target="#collapseF30"
-         aria-controls="collapseF30">
-       <div>
-           <span>Affidavit Form (F30)</span>
-       </div>
-    </div>
-    <div class="clearfix"> </div>
-    <div class="collapse" id="collapseF30">
-       <div>
-           <p>
-               Since your divorce won't require an appearance before a judge, in addition to the documents above you
-               must fill out and swear/affirm <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click" title="&lt;b&gt;Swear/Affirm&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;To &ldquo;take an oath&rdquo; in front of a lawyer, notary public, or commissioner for taking affidavits
-               that statements made in court or the contents of an affidavit are true to the best of your knowledge and belief
-               that your oath is &ldquo;under an immediate sense of responsibility to God&rdquo;. A non-religious alternative is to affirm." aria-hidden="true"></i> an <a target="_blank" href="http://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/supreme-family/f30.pdf?forcedownload=true">Affidavit Form (F30)</a>.
-               This document sets out the facts of your relationship and separation.
-           <p/>
-            <p>
-                Please follow these steps to ensure your affidavit does not get rejected:
-            </p>
-           <ul>
-               Both you and your spouse need to swear/affirm the affidavit. Take <b>photo identification</b> with you. The person who will swear/affirm the documents for you must be sure you are both who you say you are. One affidavit must be sworn/affirmed <b>at the time of filing.</b>
-           <p>
-               You'll notice that some of the information in the affidavit is the same as what's in your Notice of Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and the judge/master must have sworn evidence to make a decision, you must swear or affirm that the information in these affidavits is true.
-           </p>
-       </div>
-    </div>
-</div>
-{% endcomment %}
-{% endif %}
 
-{% if married_marriage_like == 'Legally married' %}
 <div class="question-well">
     <h2>Signing Your Affidavit Forms</h2>
     <p>
@@ -461,7 +423,6 @@
         {% endif %}
     </ul>
 </div>
-{% endif %}
 
 <div class="question-well">
     <h2>Other Documents to Take to the Court Registry</h2>
@@ -513,13 +474,7 @@
         {% if children_of_marriage == 'YES' %}
         <li>Child Support Affidavit (F37)</li>
         {% endif %}
-        {% if married_marriage_like == 'Legally married' %}
-            <li>Affidavit — Desk Order Divorce Form (F38)</li>
-        {% else %}
-            {% comment %}{# common law use case removed in DIV-495 #}
-            <li>Affidavit — Desk Order Divorce Form (F30)</li>
-            {% endcomment %}
-        {% endif %}
+        <li>Affidavit — Desk Order Divorce Form (F38)</li>
         {% if how_will_calculate_income == 'entered agreement' %}
           <li>Agreement as to Annual Income (F9)</li>
         {% endif %}
@@ -527,10 +482,8 @@
 
     <p>
         If you have other court orders or a written separation agreement, they
-        should also be attached to your Affidavit
-        {% if married_marriage_like == 'Legally married' %} — Desk Order Divorce
-        Form (F38){% else %} Form (F30){% endif %}. Note that these agreements
-        or orders must not contradict what's in your divorce application.
+        should also be attached to your Affidavit — Desk Order Divorce Form (F38).
+        Note that these agreements or orders must not contradict what's in your divorce application.
     </p>
 </div>
 
diff --git a/edivorce/apps/core/templates/question/04_marriage.html b/edivorce/apps/core/templates/question/04_marriage.html
index c68e2877..256e2409 100644
--- a/edivorce/apps/core/templates/question/04_marriage.html
+++ b/edivorce/apps/core/templates/question/04_marriage.html
@@ -29,7 +29,6 @@
     <i class="fa fa-question-circle" aria-hidden="true"></i></span>. Not doing this can result in delays and
     your divorce request being returned for correction.</p>
 
-{% if married_marriage_like == 'Legally married' %}
 <div id="when_married" class="question-well {% if when_were_you_married_error %}error{% endif %}">
     <h3>When were you married?{% if when_were_you_married_error %}{% include 'partials/required.html' %}{% endif %}</h3>
     <p>
@@ -41,7 +40,6 @@
         </span>
     </p>
 </div>
-{% endif %}
 
 <div id="lived_together" class="question-well {% if when_were_you_live_married_like_error %}error{% endif %}">
     <h3>When did you and {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %} begin to live together in a marriage-like relationship?
@@ -87,8 +85,6 @@
     </div>
 </div>
 
-
-{% if married_marriage_like == 'Legally married' %}
 <div class="question-well {% if where_were_you_married_city_error or where_were_you_married_country_error or where_were_you_married_other_country_error %}error{% endif %}">
     <h3>Where were you married?</h3>
     <p>Enter the location as it appears on the marriage certificate (e.g. city, province or state and country)</p>
@@ -102,7 +98,6 @@
     <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="where_were_you_married_country" value="USA" %}USA</label></div>
     <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="where_were_you_married_country" value="Other" %}Other {% input_field type="text" name="where_were_you_married_other_country" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
 </div>
-{% endif %}
 
 <div class="question-well {% if marital_status_before_you_error %}error{% endif %}">
     <h3>Before you got married to {% if name_spouse %} {{ name_spouse }} {% else %} your spouse {% endif %}, what was your marital status?
diff --git a/edivorce/apps/core/templates/question/07_support.html b/edivorce/apps/core/templates/question/07_support.html
index f888ca60..276f6d93 100644
--- a/edivorce/apps/core/templates/question/07_support.html
+++ b/edivorce/apps/core/templates/question/07_support.html
@@ -152,103 +152,74 @@
 
 
 <div class="question-well {% if spouse_support_act_error %}error{% endif %}">
-    {% if married_marriage_like == "Legally married" %}
-        <h3>Please indicate which act you are asking for support under.{% if spouse_support_act_error %}{% include 'partials/required.html' %}{% endif %}
-        </h3>
-        <div class="radio">
-            <label>
-                {% input_field type="radio" name="spouse_support_act" value="The Divorce Act (Canada)" data_target_id="family_law_time_limit" data_reveal_target="false" %}
-                The Divorce Act (Canada)
-            </label> -
-            <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html"
-              target="_blank">view the Divorce Act</a>
-        </div>
-        <div class="radio">
-            <label>
-                {% input_field type="radio" name="spouse_support_act" value="The Family Law Act" data_target_id="family_law_time_limit" data_reveal_target="true" %}
-                The Family Law Act
-            </label> -
-            <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01"
-              target="_blank">view the Family Law Act</a></div>
+    <h3>Please indicate which act you are asking for support under.{% if spouse_support_act_error %}{% include 'partials/required.html' %}{% endif %}
+    </h3>
+    <div class="radio">
+        <label>
+            {% input_field type="radio" name="spouse_support_act" value="The Divorce Act (Canada)" data_target_id="family_law_time_limit" data_reveal_target="false" %}
+            The Divorce Act (Canada)
+        </label> -
+        <a href="http://laws-lois.justice.gc.ca/eng/acts/D-3.4/index.html"
+          target="_blank">view the Divorce Act</a>
+    </div>
+    <div class="radio">
+        <label>
+            {% input_field type="radio" name="spouse_support_act" value="The Family Law Act" data_target_id="family_law_time_limit" data_reveal_target="true" %}
+            The Family Law Act
+        </label> -
+        <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01"
+          target="_blank">view the Family Law Act</a></div>
 
-        <div class="information-message bg-danger" id="family_law_time_limit" hidden>
-            <h2>Time limit to apply for court order</h2>
-            <p>
-                If you were married, you must apply for spousal support under
-                the Family Law Act <b>within two years after you get an order
-                for divorce.</b> If you are applying for spousal support under
-                the Divorce Act, you do not have a time limit.
-            </p>
-        </div>
+    <div class="information-message bg-danger" id="family_law_time_limit" hidden>
+        <h2>Time limit to apply for court order</h2>
+        <p>
+            If you were married, you must apply for spousal support under
+            the Family Law Act <b>within two years after you get an order
+            for divorce.</b> If you are applying for spousal support under
+            the Divorce Act, you do not have a time limit.
+        </p>
+    </div>
 
-        <div class="collapse-trigger collapsed" data-toggle="collapse"
-             aria-expanded="false" data-target="#collapse_support_act"
-             aria-controls="collapse_support_act">
-            <div>
-                How do I know which act applies to my situation?
-            </div>
+    <div class="collapse-trigger collapsed" data-toggle="collapse"
+         aria-expanded="false" data-target="#collapse_support_act"
+         aria-controls="collapse_support_act">
+        <div>
+            How do I know which act applies to my situation?
         </div>
-        <div class="collapse" id="collapse_support_act">
-            <div>
-                <p>Ok, you may be thinking, how the heck am I supposed to know
-                which act (a written law) applies. Let's see if we can help you
-                identify which act best fits with your
-                circumstances/situation.</p>
+    </div>
+    <div class="collapse" id="collapse_support_act">
+        <div>
+            <p>Ok, you may be thinking, how the heck am I supposed to know
+            which act (a written law) applies. Let's see if we can help you
+            identify which act best fits with your
+            circumstances/situation.</p>
 
-                <p>
-                    The Family Law Act and the Divorce Act overlap in some areas but not others. The Divorce Act applies
-                    only if you're married but the Family Law Act can apply to both married and unmarried couples. Even
-                    if you are getting a divorce, you must apply under the Family Law Act for the division of property
-                    or debts, a family law protection order, or orders related to guardianship. The Divorce Act does not
-                    deal with these.
-                </p>
+            <p>
+                The Family Law Act and the Divorce Act overlap in some areas but not others. The Divorce Act applies
+                only if you're married but the Family Law Act can apply to both married and unmarried couples. Even
+                if you are getting a divorce, you must apply under the Family Law Act for the division of property
+                or debts, a family law protection order, or orders related to guardianship. The Divorce Act does not
+                deal with these.
+            </p>
 
-                <p>There are big differences in how the Divorce Act and the
-                Family Law Act deal with some issues, especially parenting. For
-                more information on
-                <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/parentingApart.php"
-                   target="_blank">which laws apply to your situation</a>
-                please refer to the Family Law of B.C. website.</p>
+            <p>There are big differences in how the Divorce Act and the
+            Family Law Act deal with some issues, especially parenting. For
+            more information on
+            <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/parentingApart.php"
+               target="_blank">which laws apply to your situation</a>
+            please refer to the Family Law of B.C. website.</p>
 
-                <img src="{% static 'img/which_laws_apply.png' %}" />
+            <img src="{% static 'img/which_laws_apply.png' %}" />
 
-                <p></p>
-                <p><strong>Still have questions? - Get Help</strong></p>
-                <p>
-                    If you're still not sure as to which act applies to your situation please refer to the
-                    <a href="{% url 'legal' %}" target="_blank">Get Help section</a> for a list of resources you can
-                    turn to for additional support.
-                </p>
-            </div>
-        </div>
-    {% else %}
-        <div class="common-law-support">
-            <div>
-                {% input_field type="hidden" id="spouse_support_act_common_law" name="spouse_support_act" value="The Family Law Act" %}
-                <p>
-                    As you and your spouse were never legally married, you must
-                    use the
-                    <a href="http://www.bclaws.ca/civix/document/id/complete/statreg/11025_01"
-                    target="_blank">Family Law Act</a> for your separation.
-                    Provincial and territorial laws apply when unmarried couples
-                    separate or when married couples separate but do not pursue a
-                    divorce.
-                </p>
-                <p>
-                    For more information on
-                    <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/what_laws_apply.php"
-                      target="_blank">which laws apply</a>
-                    to your situation please refer to the Family Law of B.C. website.
-                </p>
-            </div>
-            <div class="information-message bg-danger">
-                <h2>Time limit to apply for court order</h2>
-                <p>If you were unmarried, and you qualify for spousal support,
-                you must apply <b>within two years of the date you
-                separated</b>.</p>
-            </div>
+            <p></p>
+            <p><strong>Still have questions? - Get Help</strong></p>
+            <p>
+                If you're still not sure as to which act applies to your situation please refer to the
+                <a href="{% url 'legal' %}" target="_blank">Get Help section</a> for a list of resources you can
+                turn to for additional support.
+            </p>
         </div>
-    {% endif %}
+    </div>
 </div>
 
 
diff --git a/edivorce/apps/core/templates/question/10_other_questions.html b/edivorce/apps/core/templates/question/10_other_questions.html
index 8db595b5..9dbee4f0 100644
--- a/edivorce/apps/core/templates/question/10_other_questions.html
+++ b/edivorce/apps/core/templates/question/10_other_questions.html
@@ -81,29 +81,26 @@
     </div>
 </div>
 
-{% if married_marriage_like == "Legally married" %}
-    <div class="question-well {% if divorce_take_effect_on_error or divorce_take_effect_on_specific_date_error %}error{% endif %}">
-        <h2>Divorce is to take effect on: {% if divorce_take_effect_on_error %}{% include 'partials/required.html' %}{% endif %}</h2>
-        <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="the 31st day after the date of this order" data_target_id="take_effect_alert" data_reveal_target="false" %}the 31st day after the date of this order</label></div>
-        <div class="radio">
-            <label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="specific date" data_target_id="take_effect_alert" data_reveal_target="true" %}a specific date
-                {% if divorce_take_effect_on_specific_date_error %}{% include 'partials/required.html' with inline=True %}{% endif %}
-                <span class="input-group date date-picker-group" data-allow-future-date="true">
-                    {% input_field type="text" name="divorce_take_effect_on_specific_date" id="effect_date" class="date-picker-future other-textbox input-inline form-control" tabindex="-1" placeholder="MMM D, YYYY" %}
-                    <span class="input-group-addon" ><i class="fa fa-calendar circle"></i></span>
-                </span>
-            </label>
-            <div class="information-message bg-danger" id="take_effect_alert" hidden>
-                <p>For urgent circumstances ONLY!</p>
-            </div>
+<div class="question-well {% if divorce_take_effect_on_error or divorce_take_effect_on_specific_date_error %}error{% endif %}">
+    <h2>Divorce is to take effect on: {% if divorce_take_effect_on_error %}{% include 'partials/required.html' %}{% endif %}</h2>
+    <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="the 31st day after the date of this order" data_target_id="take_effect_alert" data_reveal_target="false" %}the 31st day after the date of this order</label></div>
+    <div class="radio">
+        <label>{% input_field type="radio" class="radio-with-other" name="divorce_take_effect_on" value="specific date" data_target_id="take_effect_alert" data_reveal_target="true" %}a specific date
+            {% if divorce_take_effect_on_specific_date_error %}{% include 'partials/required.html' with inline=True %}{% endif %}
+            <span class="input-group date date-picker-group" data-allow-future-date="true">
+                {% input_field type="text" name="divorce_take_effect_on_specific_date" id="effect_date" class="date-picker-future other-textbox input-inline form-control" tabindex="-1" placeholder="MMM D, YYYY" %}
+                <span class="input-group-addon" ><i class="fa fa-calendar circle"></i></span>
+            </span>
+        </label>
+        <div class="information-message bg-danger" id="take_effect_alert" hidden>
+            <p>For urgent circumstances ONLY!</p>
         </div>
-        <p>
-            If you select the "specific date" option you can choose to have the divorce sooner.
-            However, you will need to request this as an "other" order in Step 1 of this questionnaire and you will need to provide evidence in your affidavit as to why the court should waive the 31 days.
-        </p>
     </div>
-{% endif %}
-
+    <p>
+        If you select the "specific date" option you can choose to have the divorce sooner.
+        However, you will need to request this as an "other" order in Step 1 of this questionnaire and you will need to provide evidence in your affidavit as to why the court should waive the 31 days.
+    </p>
+</div>
 {% endblock %}
 
 {% block formBack %}{% prev_step step='other_questions' %}{% endblock %}