diff --git a/services/web/app/views/subscriptions/dashboard.jade b/services/web/app/views/subscriptions/dashboard.jade
index 175c8d1e4f..3448dc9072 100644
--- a/services/web/app/views/subscriptions/dashboard.jade
+++ b/services/web/app/views/subscriptions/dashboard.jade
@@ -113,39 +113,28 @@ block content
 							div
 								a(href="/subscription/group").btn.btn-primary !{translate("manage_group")}
 
-
-
 					.card(ng-if="view == 'cancelation'")
 						.page-header
 							h1 #{translate("Cancel Subscription")}
 
-						span(ng-if="sixpackOpt == 'downgrade-options'")
+						div(ng-show="showExtendFreeTrial", style="text-align: center")
+							p !{translate("have_more_days_to_try", {days:14})}
+							button(type="submit", ng-click="exendTrial()", ng-disabled='inflight').btn.btn-success #{translate("ill_take_it")}
+							p
+								|  
+							p
+								a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")}
 
-							div(ng-show="showExtendFreeTrial", style="text-align: center")
-								p !{translate("have_more_days_to_try", {days:14})}
-								button(type="submit", ng-click="exendTrial()", ng-disabled='inflight').btn.btn-success #{translate("ill_take_it")}
+						div(ng-show="showDowngradeToStudent", style="text-align: center")
+							span(ng-controller="ChangePlanFormController")
+								p !{translate("interested_in_cheaper_plan",{price:'{{studentPrice}}'})}
+								button(type="submit", ng-click="downgradeToStudent()", ng-disabled='inflight').btn.btn-success #{translate("yes_please")}
 								p
 									|  
 								p
-									a(href, ng-click="cancelSubscription()", ng-disabled='inflight') #{translate("no_thanks_cancel_now")}
+									a(href, ng-click="cancelSubscription()", ng-disabled='inflight')  #{translate("no_thanks_cancel_now")}
 
-
-							div(ng-show="showDowngradeToStudent", style="text-align: center")
-								span(ng-controller="ChangePlanFormController")
-									p !{translate("interested_in_cheaper_plan",{price:'{{studentPrice}}'})}
-									button(type="submit", ng-click="downgradeToStudent()", ng-disabled='inflight').btn.btn-success #{translate("yes_please")}
-									p
-										|  
-									p
-										a(href, ng-click="cancelSubscription()", ng-disabled='inflight')  #{translate("no_thanks_cancel_now")}
-
-							div(ng-show="showBasicCancel")
-								p #{translate("sure_you_want_to_cancel")}
-								a(href="/project").btn.btn-info #{translate("i_want_to_stay")}
-								|  
-								a(ng-click="cancelSubscription()", ng-disabled='inflight').btn.btn-primary #{translate("cancel_my_account")}
-
-						span(ng-if="sixpackOpt == 'basic'")
+						div(ng-show="showBasicCancel")
 							p #{translate("sure_you_want_to_cancel")}
 							a(href="/project").btn.btn-info #{translate("i_want_to_stay")}
 							|  
diff --git a/services/web/app/views/subscriptions/successful_subscription.jade b/services/web/app/views/subscriptions/successful_subscription.jade
index 17ac4f3594..184c89c0d2 100644
--- a/services/web/app/views/subscriptions/successful_subscription.jade
+++ b/services/web/app/views/subscriptions/successful_subscription.jade
@@ -10,13 +10,8 @@ block content
 							h2 #{translate("thanks_for_subscribing")}
 						.alert.alert-success
 							p !{translate("next_payment_of_x_collectected_on_y", {paymentAmmount:"<strong>"+subscription.price+"</strong>", collectionDate:"<strong>"+subscription.nextPaymentDueAt+"</strong>"})}
-							span(sixpack-switch="upgrade-success-message")
-								span(sixpack-default)
-									p #{translate("if_you_dont_want_to_be_charged")}
-										a(href="/user/subscription") #{translate("click_here_to_cancel")}.
-								span(sixpack-when="manage-subscription")
-									p #{translate("to_modify_your_subscription_go_to")} 
-										a(href="/user/subscription")  #{translate("manage_subscription")}.
+							p #{translate("to_modify_your_subscription_go_to")} 
+								a(href="/user/subscription")  #{translate("manage_subscription")}.
 						p
 							- if (subscription.groupPlan == true)
 								a.btn.btn-success.btn-large(href="/subscription/group") #{translate("add_your_first_group_member_now")}
diff --git a/services/web/public/coffee/main/subscription-dashboard.coffee b/services/web/public/coffee/main/subscription-dashboard.coffee
index 71bc198e6d..27e984dc38 100644
--- a/services/web/public/coffee/main/subscription-dashboard.coffee
+++ b/services/web/public/coffee/main/subscription-dashboard.coffee
@@ -153,9 +153,7 @@ define [
 			$scope.inflight = true
 			$http.post("/user/subscription/cancel", body)
 				.success ->
-					sixpack.convert 'cancelation-options-view', ->
-						sixpack.convert 'upgrade-success-message', ->
-							location.reload()
+					location.reload()
 				.error ->
 					console.log "something went wrong changing plan"
 
@@ -169,9 +167,7 @@ define [
 			)
 
 		$scope.switchToCancelationView = ->
-			sixpack.participate 'cancelation-options-view', ['basic', 'downgrade-options'], (view, rawResponse)->
-				$scope.view = "cancelation"
-				$scope.sixpackOpt = view
+			$scope.view = "cancelation"