{% load i18n %}
{% load hq_shared_tags %}
<div class="btn-group">
    <button class="btn" data-bind="click: addProperty">{% trans "Add Property" %}</button>
    {% if request|feature_preview_enabled:'CALC_XPATHS' or request|toggle_enabled:'GRAPH_CREATION' %}
    <button class="btn dropdown-toggle" data-toggle="dropdown">
        <span class="caret"></span>
    </button>
    <ul class="dropdown-menu">
        <li data-bind="click: addProperty"><a>{% trans "Property" %}</a></li>
        {% if request|feature_preview_enabled:'CALC_XPATHS' %}
        <li data-bind="click: addCalculation"><a>{% trans "Calculation" %}</a></li>
        {% endif %}
        {% if request|toggle_enabled:'GRAPH_CREATION' %}
        <!-- ko if: COMMCAREHQ.app_manager.checkCommcareVersion("2.17") -->
        <li data-bind="click: addGraph"><a>{% trans "Graph" %}</a></li>
        <!-- /ko -->
        <!-- ko ifnot: COMMCAREHQ.app_manager.checkCommcareVersion("2.17") -->
        <li class="disabled"><a>{% trans "Graph <small>(upgrade to 2.17 or greater)</small>" %}</a></li>
        <!-- /ko -->
        {% endif %}
    </ul>
    {% endif %}
</div>

{% load i18n %}
{% load hq_shared_tags %}
<div class="btn-group">
    <button class="btn" data-bind="click: addProperty">{% trans "Add Property" %}</button>
    {% if request|toggle_enabled:'GRAPH_CREATION' %}
    <button class="btn dropdown-toggle" data-toggle="dropdown">
        <span class="caret"></span>
    </button>
    <ul class="dropdown-menu">
        <li data-bind="click: addProperty"><a>{% trans "Property" %}</a></li>
        {% if request|toggle_enabled:'GRAPH_CREATION' %}
        <!-- ko if: COMMCAREHQ.app_manager.checkCommcareVersion("2.17") -->
        <li data-bind="click: addGraph"><a>{% trans "Graph" %}</a></li>
        <!-- /ko -->
        <!-- ko ifnot: COMMCAREHQ.app_manager.checkCommcareVersion("2.17") -->
        <li class="disabled"><a>{% trans "Graph <small>(upgrade to 2.17 or greater)</small>" %}</a></li>
        <!-- /ko -->
        {% endif %}
    </ul>
    {% endif %}
</div>

Remove 'Calculation' from 'Add Property' dropdown
Remove 'Calculation' from 'Add Property' dropdown
