diff --git a/services/registration/Makefile b/services/registration/Makefile
deleted file mode 100644
index d5950b5..0000000
--- a/services/registration/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Variables to match files in the current directory
-INPUTS = $(wildcard ./*.vis)
-TXTS = $(wildcard ./*.txt.orig)
-VISE_PATH := ../../go-vise
-
-# Rule to build .bin files from .vis files
-%.vis:
-	go run  $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
-	@echo "Built $(basename $@).bin from $(basename $@).vis"
-
-# Rule to copy .orig files to .txt
-%.txt.orig:
-	cp -v $(basename $@).orig $(basename $@)
-	@echo "Copied $(basename $@).orig to $(basename $@)"
-
-# 'all' target depends on all .vis and .txt.orig files
-all: $(INPUTS) $(TXTS)
-	@echo "Running all: $(INPUTS) $(TXTS)"
diff --git a/services/registration/_catch b/services/registration/_catch
deleted file mode 100644
index e81b8e9..0000000
--- a/services/registration/_catch
+++ /dev/null
@@ -1 +0,0 @@
-Something went wrong.Please try again
\ No newline at end of file
diff --git a/services/registration/_catch.vis b/services/registration/_catch.vis
deleted file mode 100644
index 72e55ad..0000000
--- a/services/registration/_catch.vis
+++ /dev/null
@@ -1 +0,0 @@
-HALT
diff --git a/services/registration/_catch_swa b/services/registration/_catch_swa
deleted file mode 100644
index 3affebd..0000000
--- a/services/registration/_catch_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.
\ No newline at end of file
diff --git a/services/registration/account_creation b/services/registration/account_creation
deleted file mode 100644
index e9463a6..0000000
--- a/services/registration/account_creation
+++ /dev/null
@@ -1 +0,0 @@
-Your account is being created...
\ No newline at end of file
diff --git a/services/registration/account_creation.vis b/services/registration/account_creation.vis
deleted file mode 100644
index 380fe6d..0000000
--- a/services/registration/account_creation.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-RELOAD verify_create_pin
-CATCH create_pin_mismatch flag_pin_mismatch 1
-LOAD quit 0
-HALT
diff --git a/services/registration/account_creation_failed b/services/registration/account_creation_failed
deleted file mode 100644
index 0df00db..0000000
--- a/services/registration/account_creation_failed
+++ /dev/null
@@ -1 +0,0 @@
-Your account creation request failed. Please try again later.
\ No newline at end of file
diff --git a/services/registration/account_creation_failed.vis b/services/registration/account_creation_failed.vis
deleted file mode 100644
index b62b797..0000000
--- a/services/registration/account_creation_failed.vis
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUT quit 9
-HALT
-INCMP quit 9
diff --git a/services/registration/account_creation_failed_swa b/services/registration/account_creation_failed_swa
deleted file mode 100644
index 6f0ac7b..0000000
--- a/services/registration/account_creation_failed_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ombi lako la kusajiliwa haliwezi kukamilishwa. Tafadhali jaribu tena baadaye.
\ No newline at end of file
diff --git a/services/registration/account_creation_swa b/services/registration/account_creation_swa
deleted file mode 100644
index 6e5b1e1..0000000
--- a/services/registration/account_creation_swa
+++ /dev/null
@@ -1 +0,0 @@
-Akaunti yako inatengenezwa...
\ No newline at end of file
diff --git a/services/registration/account_menu b/services/registration/account_menu
deleted file mode 100644
index 7aa9fe9..0000000
--- a/services/registration/account_menu
+++ /dev/null
@@ -1 +0,0 @@
-My Account
\ No newline at end of file
diff --git a/services/registration/account_menu_swa b/services/registration/account_menu_swa
deleted file mode 100644
index c77102f..0000000
--- a/services/registration/account_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Akaunti yangu
\ No newline at end of file
diff --git a/services/registration/account_pending b/services/registration/account_pending
deleted file mode 100644
index 4eadf25..0000000
--- a/services/registration/account_pending
+++ /dev/null
@@ -1 +0,0 @@
-Your account is still being created.
\ No newline at end of file
diff --git a/services/registration/account_pending.vis b/services/registration/account_pending.vis
deleted file mode 100644
index d122613..0000000
--- a/services/registration/account_pending.vis
+++ /dev/null
@@ -1,3 +0,0 @@
-RELOAD check_account_status
-CATCH main flag_account_success 1
-HALT
diff --git a/services/registration/account_pending_swa b/services/registration/account_pending_swa
deleted file mode 100644
index 2e514b5..0000000
--- a/services/registration/account_pending_swa
+++ /dev/null
@@ -1 +0,0 @@
-Akaunti yako bado inatengenezwa
\ No newline at end of file
diff --git a/services/registration/address b/services/registration/address
deleted file mode 100644
index 6353876..0000000
--- a/services/registration/address
+++ /dev/null
@@ -1 +0,0 @@
-Address: {{.check_identifier}}
\ No newline at end of file
diff --git a/services/registration/address.vis b/services/registration/address.vis
deleted file mode 100644
index dfc46d1..0000000
--- a/services/registration/address.vis
+++ /dev/null
@@ -1,8 +0,0 @@
-LOAD check_identifier 0
-RELOAD check_identifier
-MAP check_identifier
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9
diff --git a/services/registration/address_swa b/services/registration/address_swa
deleted file mode 100644
index 3e7a55e..0000000
--- a/services/registration/address_swa
+++ /dev/null
@@ -1 +0,0 @@
-Anwani:{{.check_identifier}}
\ No newline at end of file
diff --git a/services/registration/amount b/services/registration/amount
deleted file mode 100644
index 9142aba..0000000
--- a/services/registration/amount
+++ /dev/null
@@ -1,2 +0,0 @@
-Maximum amount: {{.max_amount}}
-Enter amount:
\ No newline at end of file
diff --git a/services/registration/amount.vis b/services/registration/amount.vis
deleted file mode 100644
index 2266160..0000000
--- a/services/registration/amount.vis
+++ /dev/null
@@ -1,15 +0,0 @@
-LOAD reset_transaction_amount 0
-LOAD max_amount 10
-RELOAD max_amount
-MAP max_amount
-MOUT back 0
-HALT
-LOAD validate_amount 64
-RELOAD validate_amount
-CATCH api_failure flag_api_call_error  1
-CATCH invalid_amount flag_invalid_amount 1
-INCMP _ 0
-LOAD get_recipient 0
-LOAD get_sender 64
-LOAD get_amount 32
-INCMP transaction_pin *
diff --git a/services/registration/amount_swa b/services/registration/amount_swa
deleted file mode 100644
index 0c8cf01..0000000
--- a/services/registration/amount_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Kiwango cha juu: {{.max_amount}}
-Weka kiwango:
\ No newline at end of file
diff --git a/services/registration/api_failure b/services/registration/api_failure
deleted file mode 100644
index 06d2d9e..0000000
--- a/services/registration/api_failure
+++ /dev/null
@@ -1 +0,0 @@
-Failed to connect to the custodial service.Please try again.
\ No newline at end of file
diff --git a/services/registration/api_failure.vis b/services/registration/api_failure.vis
deleted file mode 100644
index 37b3deb..0000000
--- a/services/registration/api_failure.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/back_menu b/services/registration/back_menu
deleted file mode 100644
index 2278c97..0000000
--- a/services/registration/back_menu
+++ /dev/null
@@ -1 +0,0 @@
-Back
\ No newline at end of file
diff --git a/services/registration/back_menu_swa b/services/registration/back_menu_swa
deleted file mode 100644
index c3e6e37..0000000
--- a/services/registration/back_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Rudi
\ No newline at end of file
diff --git a/services/registration/balances b/services/registration/balances
deleted file mode 100644
index 27a69d5..0000000
--- a/services/registration/balances
+++ /dev/null
@@ -1 +0,0 @@
-Balances:
\ No newline at end of file
diff --git a/services/registration/balances.vis b/services/registration/balances.vis
deleted file mode 100644
index 9a346d5..0000000
--- a/services/registration/balances.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD reset_account_authorized 0
-RELOAD reset_account_authorized
-MOUT my_balance 1
-MOUT community_balance 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP my_balance 1
-INCMP community_balance 2
-INCMP . * 
diff --git a/services/registration/balances_swa b/services/registration/balances_swa
deleted file mode 100644
index 1649055..0000000
--- a/services/registration/balances_swa
+++ /dev/null
@@ -1 +0,0 @@
-Salio:
\ No newline at end of file
diff --git a/services/registration/blocked_account.vis b/services/registration/blocked_account.vis
deleted file mode 100644
index d8adab2..0000000
--- a/services/registration/blocked_account.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-LOAD show_blocked_account 0
-HALT 
diff --git a/services/registration/change_language b/services/registration/change_language
deleted file mode 100644
index 72bedfe..0000000
--- a/services/registration/change_language
+++ /dev/null
@@ -1 +0,0 @@
-Select language:
\ No newline at end of file
diff --git a/services/registration/change_language.vis b/services/registration/change_language.vis
deleted file mode 100644
index f20bcfb..0000000
--- a/services/registration/change_language.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD reset_account_authorized 0
-LOAD reset_incorrect 0
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH pin_entry flag_account_authorized 0
-MOUT english 1
-MOUT kiswahili 2
-HALT
-INCMP set_eng 1
-INCMP set_swa 2
-INCMP . *
diff --git a/services/registration/change_language_menu b/services/registration/change_language_menu
deleted file mode 100644
index 7175fce..0000000
--- a/services/registration/change_language_menu
+++ /dev/null
@@ -1 +0,0 @@
-Change language
\ No newline at end of file
diff --git a/services/registration/change_language_menu_swa b/services/registration/change_language_menu_swa
deleted file mode 100644
index 58cdd10..0000000
--- a/services/registration/change_language_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Badili lugha
\ No newline at end of file
diff --git a/services/registration/change_language_swa b/services/registration/change_language_swa
deleted file mode 100644
index 90e21a8..0000000
--- a/services/registration/change_language_swa
+++ /dev/null
@@ -1 +0,0 @@
-Chagua lugha:
\ No newline at end of file
diff --git a/services/registration/change_pin_menu b/services/registration/change_pin_menu
deleted file mode 100644
index 4fa175a..0000000
--- a/services/registration/change_pin_menu
+++ /dev/null
@@ -1 +0,0 @@
-Change PIN
\ No newline at end of file
diff --git a/services/registration/change_pin_menu_swa b/services/registration/change_pin_menu_swa
deleted file mode 100644
index bb51b21..0000000
--- a/services/registration/change_pin_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Badili PIN
\ No newline at end of file
diff --git a/services/registration/check_balance_menu b/services/registration/check_balance_menu
deleted file mode 100644
index 253f368..0000000
--- a/services/registration/check_balance_menu
+++ /dev/null
@@ -1 +0,0 @@
-Check balances
\ No newline at end of file
diff --git a/services/registration/check_balance_menu_swa b/services/registration/check_balance_menu_swa
deleted file mode 100644
index 4fe14f2..0000000
--- a/services/registration/check_balance_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Angalia salio
\ No newline at end of file
diff --git a/services/registration/check_statement b/services/registration/check_statement
deleted file mode 100644
index 0e989db..0000000
--- a/services/registration/check_statement
+++ /dev/null
@@ -1 +0,0 @@
-Please enter your PIN to view statement:
\ No newline at end of file
diff --git a/services/registration/check_statement.vis b/services/registration/check_statement.vis
deleted file mode 100644
index d79b5ca..0000000
--- a/services/registration/check_statement.vis
+++ /dev/null
@@ -1,12 +0,0 @@
-LOAD check_transactions 0
-RELOAD check_transactions
-CATCH no_transfers flag_no_transfers 1
-LOAD authorize_account 6
-MOUT back 0
-MOUT quit 9
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP transactions *
diff --git a/services/registration/check_statement_menu b/services/registration/check_statement_menu
deleted file mode 100644
index 70e2bd5..0000000
--- a/services/registration/check_statement_menu
+++ /dev/null
@@ -1 +0,0 @@
-Check statement
\ No newline at end of file
diff --git a/services/registration/check_statement_menu_swa b/services/registration/check_statement_menu_swa
deleted file mode 100644
index b8a338d..0000000
--- a/services/registration/check_statement_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Taarifa ya matumizi
\ No newline at end of file
diff --git a/services/registration/check_statement_swa b/services/registration/check_statement_swa
deleted file mode 100644
index 468364f..0000000
--- a/services/registration/check_statement_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tafadhali weka PIN yako kuona taarifa ya matumizi:
\ No newline at end of file
diff --git a/services/registration/comminity_balance_swa b/services/registration/comminity_balance_swa
deleted file mode 100644
index d9f1d6e..0000000
--- a/services/registration/comminity_balance_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.fetch_community_balance}}
\ No newline at end of file
diff --git a/services/registration/community_balance b/services/registration/community_balance
deleted file mode 100644
index d9f1d6e..0000000
--- a/services/registration/community_balance
+++ /dev/null
@@ -1 +0,0 @@
-{{.fetch_community_balance}}
\ No newline at end of file
diff --git a/services/registration/community_balance.vis b/services/registration/community_balance.vis
deleted file mode 100644
index fad90cc..0000000
--- a/services/registration/community_balance.vis
+++ /dev/null
@@ -1,12 +0,0 @@
-LOAD reset_incorrect 6
-LOAD fetch_community_balance 0
-CATCH api_failure  flag_api_call_error  1
-MAP fetch_community_balance
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9
-INCMP . * 
diff --git a/services/registration/community_balance_menu b/services/registration/community_balance_menu
deleted file mode 100644
index a7344a2..0000000
--- a/services/registration/community_balance_menu
+++ /dev/null
@@ -1 +0,0 @@
-Community balance
\ No newline at end of file
diff --git a/services/registration/community_balance_menu_swa b/services/registration/community_balance_menu_swa
deleted file mode 100644
index 726fc99..0000000
--- a/services/registration/community_balance_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Salio la kikundi
\ No newline at end of file
diff --git a/services/registration/confirm_create_pin b/services/registration/confirm_create_pin
deleted file mode 100644
index e4632ad..0000000
--- a/services/registration/confirm_create_pin
+++ /dev/null
@@ -1 +0,0 @@
-Enter your four number PIN again:
\ No newline at end of file
diff --git a/services/registration/confirm_create_pin.vis b/services/registration/confirm_create_pin.vis
deleted file mode 100644
index 02279dc..0000000
--- a/services/registration/confirm_create_pin.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD save_temporary_pin 6
-HALT
-LOAD verify_create_pin 8
-INCMP account_creation *
diff --git a/services/registration/confirm_create_pin_swa b/services/registration/confirm_create_pin_swa
deleted file mode 100644
index f697854..0000000
--- a/services/registration/confirm_create_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka PIN yako tena:
\ No newline at end of file
diff --git a/services/registration/confirm_others_new_pin b/services/registration/confirm_others_new_pin
deleted file mode 100644
index d345a0a..0000000
--- a/services/registration/confirm_others_new_pin
+++ /dev/null
@@ -1 +0,0 @@
-Please confirm new PIN  for:{{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/confirm_others_new_pin.vis b/services/registration/confirm_others_new_pin.vis
deleted file mode 100644
index 9132dc4..0000000
--- a/services/registration/confirm_others_new_pin.vis
+++ /dev/null
@@ -1,14 +0,0 @@
-CATCH pin_entry flag_incorrect_pin 1
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-CATCH invalid_others_pin flag_valid_pin 0
-CATCH pin_reset_result flag_account_authorized 1
-LOAD save_others_temporary_pin 6
-RELOAD save_others_temporary_pin
-MOUT back 0
-HALT 
-INCMP _ 0
-LOAD check_pin_mismatch 0
-RELOAD check_pin_mismatch
-CATCH others_pin_mismatch flag_pin_mismatch 1
-INCMP pin_entry *
diff --git a/services/registration/confirm_others_new_pin_swa b/services/registration/confirm_others_new_pin_swa
deleted file mode 100644
index f0b09c8..0000000
--- a/services/registration/confirm_others_new_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/confirm_pin_change b/services/registration/confirm_pin_change
deleted file mode 100644
index 398a827..0000000
--- a/services/registration/confirm_pin_change
+++ /dev/null
@@ -1 +0,0 @@
-Confirm your new PIN:
diff --git a/services/registration/confirm_pin_change.vis b/services/registration/confirm_pin_change.vis
deleted file mode 100644
index cf485a1..0000000
--- a/services/registration/confirm_pin_change.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-CATCH invalid_pin flag_valid_pin 0
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP * pin_reset_success
diff --git a/services/registration/confirm_pin_change_swa b/services/registration/confirm_pin_change_swa
deleted file mode 100644
index c7af4ea..0000000
--- a/services/registration/confirm_pin_change_swa
+++ /dev/null
@@ -1 +0,0 @@
-Thibitisha PIN yako mpya:
diff --git a/services/registration/create_pin b/services/registration/create_pin
deleted file mode 100644
index f8836f5..0000000
--- a/services/registration/create_pin
+++ /dev/null
@@ -1 +0,0 @@
-Please enter a new four number PIN for your account:
\ No newline at end of file
diff --git a/services/registration/create_pin.vis b/services/registration/create_pin.vis
deleted file mode 100644
index 40989ec..0000000
--- a/services/registration/create_pin.vis
+++ /dev/null
@@ -1,9 +0,0 @@
-LOAD create_account 0
-CATCH account_creation_failed flag_account_creation_failed 1
-MOUT exit 0
-HALT
-LOAD save_temporary_pin 6
-RELOAD save_temporary_pin
-CATCH . flag_incorrect_pin 1
-INCMP quit 0
-INCMP confirm_create_pin *
diff --git a/services/registration/create_pin_mismatch b/services/registration/create_pin_mismatch
deleted file mode 100644
index e75068c..0000000
--- a/services/registration/create_pin_mismatch
+++ /dev/null
@@ -1 +0,0 @@
-The PIN is not a match. Try again
\ No newline at end of file
diff --git a/services/registration/create_pin_mismatch.vis b/services/registration/create_pin_mismatch.vis
deleted file mode 100644
index 91793b5..0000000
--- a/services/registration/create_pin_mismatch.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_create_pin 1
-INCMP quit 9
diff --git a/services/registration/create_pin_mismatch_swa b/services/registration/create_pin_mismatch_swa
deleted file mode 100644
index a1d7b6d..0000000
--- a/services/registration/create_pin_mismatch_swa
+++ /dev/null
@@ -1 +0,0 @@
-PIN uliyoweka haifanani. Jaribu tena
\ No newline at end of file
diff --git a/services/registration/create_pin_swa b/services/registration/create_pin_swa
deleted file mode 100644
index 1fdd972..0000000
--- a/services/registration/create_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tafadhali weka PIN mpya yenye nambari nne kwa akaunti yako:
\ No newline at end of file
diff --git a/services/registration/display_profile_info b/services/registration/display_profile_info
deleted file mode 100644
index 669c6c6..0000000
--- a/services/registration/display_profile_info
+++ /dev/null
@@ -1,5 +0,0 @@
-Wasifu wangu
-Name: Not provided
-Gender: Not provided
-Age: Not provided
-Location: Not provided
\ No newline at end of file
diff --git a/services/registration/display_profile_info.vis b/services/registration/display_profile_info.vis
deleted file mode 100644
index 3790a08..0000000
--- a/services/registration/display_profile_info.vis
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0
diff --git a/services/registration/display_profile_info_swa b/services/registration/display_profile_info_swa
deleted file mode 100644
index e69de29..0000000
diff --git a/services/registration/edit_family_name b/services/registration/edit_family_name
deleted file mode 100644
index 1d637be..0000000
--- a/services/registration/edit_family_name
+++ /dev/null
@@ -1,2 +0,0 @@
-Current family name: {{.get_current_profile_info}}
-Enter family name:
\ No newline at end of file
diff --git a/services/registration/edit_family_name.vis b/services/registration/edit_family_name.vis
deleted file mode 100644
index 590eab1..0000000
--- a/services/registration/edit_family_name.vis
+++ /dev/null
@@ -1,18 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_familyname flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-MAP get_current_profile_info
-MOUT back 0
-HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
-LOAD save_familyname 64
-RELOAD save_familyname
-CATCH pin_entry flag_familyname_set 1
-CATCH select_gender flag_gender_set 0
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_familyname_set 0
-INCMP select_gender *
diff --git a/services/registration/edit_family_name_menu b/services/registration/edit_family_name_menu
deleted file mode 100644
index 21a9033..0000000
--- a/services/registration/edit_family_name_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit family name
\ No newline at end of file
diff --git a/services/registration/edit_family_name_menu_swa b/services/registration/edit_family_name_menu_swa
deleted file mode 100644
index 48a38b2..0000000
--- a/services/registration/edit_family_name_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka jina la familia
\ No newline at end of file
diff --git a/services/registration/edit_family_name_swa b/services/registration/edit_family_name_swa
deleted file mode 100644
index a1a1cab..0000000
--- a/services/registration/edit_family_name_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Jina la familia la sasa: {{.get_current_profile_info}}
-Weka jina la familia
\ No newline at end of file
diff --git a/services/registration/edit_first_name b/services/registration/edit_first_name
deleted file mode 100644
index 3d141ee..0000000
--- a/services/registration/edit_first_name
+++ /dev/null
@@ -1,2 +0,0 @@
-Current name: {{.get_current_profile_info}}
-Enter your first names:
\ No newline at end of file
diff --git a/services/registration/edit_first_name.vis b/services/registration/edit_first_name.vis
deleted file mode 100644
index 6848b9c..0000000
--- a/services/registration/edit_first_name.vis
+++ /dev/null
@@ -1,18 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_firstname flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-MAP get_current_profile_info
-MOUT back 0
-HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
-LOAD save_firstname 128
-RELOAD save_firstname
-CATCH pin_entry flag_firstname_set 1
-CATCH edit_family_name flag_familyname_set 0
-CATCH edit_gender flag_gender_set 0
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_firstname_set 0
diff --git a/services/registration/edit_first_name_menu b/services/registration/edit_first_name_menu
deleted file mode 100644
index c7383b7..0000000
--- a/services/registration/edit_first_name_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit name
\ No newline at end of file
diff --git a/services/registration/edit_first_name_menu_swa b/services/registration/edit_first_name_menu_swa
deleted file mode 100644
index 9395f7c..0000000
--- a/services/registration/edit_first_name_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka jina
\ No newline at end of file
diff --git a/services/registration/edit_first_name_swa b/services/registration/edit_first_name_swa
deleted file mode 100644
index 5776bf0..0000000
--- a/services/registration/edit_first_name_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Jina la kwanza la sasa: {{.get_current_profile_info}}
-Weka majina yako ya kwanza:
\ No newline at end of file
diff --git a/services/registration/edit_gender_menu b/services/registration/edit_gender_menu
deleted file mode 100644
index 8946918..0000000
--- a/services/registration/edit_gender_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit gender
\ No newline at end of file
diff --git a/services/registration/edit_gender_menu_swa b/services/registration/edit_gender_menu_swa
deleted file mode 100644
index 6d31ea8..0000000
--- a/services/registration/edit_gender_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka jinsia
\ No newline at end of file
diff --git a/services/registration/edit_location b/services/registration/edit_location
deleted file mode 100644
index 4e11d1a..0000000
--- a/services/registration/edit_location
+++ /dev/null
@@ -1,2 +0,0 @@
-Current location: {{.get_current_profile_info}}
-Enter your location:
\ No newline at end of file
diff --git a/services/registration/edit_location.vis b/services/registration/edit_location.vis
deleted file mode 100644
index e4fcd8b..0000000
--- a/services/registration/edit_location.vis
+++ /dev/null
@@ -1,15 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_location flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-LOAD save_location 16
-MOUT back 0
-HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
-RELOAD save_location
-INCMP _ 0
-CATCH pin_entry flag_location_set 1
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_location_set 0
-INCMP edit_offerings *
diff --git a/services/registration/edit_location_menu b/services/registration/edit_location_menu
deleted file mode 100644
index 39ff1b7..0000000
--- a/services/registration/edit_location_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit location
\ No newline at end of file
diff --git a/services/registration/edit_location_menu_swa b/services/registration/edit_location_menu_swa
deleted file mode 100644
index a2a0e59..0000000
--- a/services/registration/edit_location_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka eneo
\ No newline at end of file
diff --git a/services/registration/edit_location_swa b/services/registration/edit_location_swa
deleted file mode 100644
index 179c421..0000000
--- a/services/registration/edit_location_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Eneo la sasa: {{.get_current_profile_info}}
-Weka eneo:
\ No newline at end of file
diff --git a/services/registration/edit_offerings b/services/registration/edit_offerings
deleted file mode 100644
index 5bb0e7f..0000000
--- a/services/registration/edit_offerings
+++ /dev/null
@@ -1,2 +0,0 @@
-Current offerings: {{.get_current_profile_info}}
-Enter the services or goods you offer: 
\ No newline at end of file
diff --git a/services/registration/edit_offerings.vis b/services/registration/edit_offerings.vis
deleted file mode 100644
index 9c1e747..0000000
--- a/services/registration/edit_offerings.vis
+++ /dev/null
@@ -1,13 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_offerings flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-LOAD save_offerings 8
-MOUT back 0
-HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
-RELOAD save_offerings
-INCMP _ 0
-CATCH pin_entry flag_offerings_set 1
-INCMP update_profile_items *
diff --git a/services/registration/edit_offerings_menu b/services/registration/edit_offerings_menu
deleted file mode 100644
index 477ad54..0000000
--- a/services/registration/edit_offerings_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit offerings
\ No newline at end of file
diff --git a/services/registration/edit_offerings_menu_swa b/services/registration/edit_offerings_menu_swa
deleted file mode 100644
index f37e125..0000000
--- a/services/registration/edit_offerings_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka unachouza
\ No newline at end of file
diff --git a/services/registration/edit_offerings_swa b/services/registration/edit_offerings_swa
deleted file mode 100644
index cd81497..0000000
--- a/services/registration/edit_offerings_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Unachouza kwa sasa: {{.get_current_profile_info}}
-Weka unachouza
\ No newline at end of file
diff --git a/services/registration/edit_profile b/services/registration/edit_profile
deleted file mode 100644
index 2c808e6..0000000
--- a/services/registration/edit_profile
+++ /dev/null
@@ -1 +0,0 @@
-My profile
\ No newline at end of file
diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis
deleted file mode 100644
index 0f0adb7..0000000
--- a/services/registration/edit_profile.vis
+++ /dev/null
@@ -1,23 +0,0 @@
-LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
-LOAD reset_allow_update 0
-RELOAD reset_allow_update
-MOUT edit_first_name 1
-MOUT edit_family_name 2
-MOUT edit_gender 3
-MOUT edit_yob 4
-MOUT edit_location 5
-MOUT edit_offerings 6
-MOUT view 7
-MOUT back 0
-HALT
-LOAD set_back 6
-INCMP ^ 0
-INCMP edit_first_name 1
-INCMP edit_family_name 2
-INCMP select_gender 3
-INCMP edit_yob 4
-INCMP edit_location 5
-INCMP edit_offerings 6
-INCMP view_profile 7
-INCMP . * 
diff --git a/services/registration/edit_profile_swa b/services/registration/edit_profile_swa
deleted file mode 100644
index 8a12b7d..0000000
--- a/services/registration/edit_profile_swa
+++ /dev/null
@@ -1 +0,0 @@
-Wasifu wangu
\ No newline at end of file
diff --git a/services/registration/edit_yob b/services/registration/edit_yob
deleted file mode 100644
index 105812b..0000000
--- a/services/registration/edit_yob
+++ /dev/null
@@ -1,2 +0,0 @@
-Current year of birth: {{.get_current_profile_info}}
-Enter your year of birth
\ No newline at end of file
diff --git a/services/registration/edit_yob.vis b/services/registration/edit_yob.vis
deleted file mode 100644
index 255bea5..0000000
--- a/services/registration/edit_yob.vis
+++ /dev/null
@@ -1,19 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_yob flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-MAP get_current_profile_info
-MOUT back 0
-HALT
-RELOAD set_back 
-CATCH _ flag_back_set 1
-LOAD verify_yob 6
-RELOAD verify_yob
-CATCH incorrect_date_format flag_incorrect_date_format 1
-LOAD save_yob 32
-RELOAD save_yob
-CATCH pin_entry flag_yob_set 1
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_yob_set 0
-INCMP edit_location *
diff --git a/services/registration/edit_yob_menu b/services/registration/edit_yob_menu
deleted file mode 100644
index 3451781..0000000
--- a/services/registration/edit_yob_menu
+++ /dev/null
@@ -1 +0,0 @@
-Edit year of birth
\ No newline at end of file
diff --git a/services/registration/edit_yob_menu_swa b/services/registration/edit_yob_menu_swa
deleted file mode 100644
index 9bb272a..0000000
--- a/services/registration/edit_yob_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka mwaka wa kuzaliwa
\ No newline at end of file
diff --git a/services/registration/edit_yob_swa b/services/registration/edit_yob_swa
deleted file mode 100644
index f923c86..0000000
--- a/services/registration/edit_yob_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Mwaka wa sasa wa kuzaliwa: {{.get_current_profile_info}}
-Weka mwaka wa kuzaliwa
\ No newline at end of file
diff --git a/services/registration/english_menu b/services/registration/english_menu
deleted file mode 100644
index 3d38949..0000000
--- a/services/registration/english_menu
+++ /dev/null
@@ -1 +0,0 @@
-English
\ No newline at end of file
diff --git a/services/registration/enter_other_number b/services/registration/enter_other_number
deleted file mode 100644
index 1c4a481..0000000
--- a/services/registration/enter_other_number
+++ /dev/null
@@ -1 +0,0 @@
-Enter other's phone number:
\ No newline at end of file
diff --git a/services/registration/enter_other_number.vis b/services/registration/enter_other_number.vis
deleted file mode 100644
index 0957165..0000000
--- a/services/registration/enter_other_number.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-CATCH no_admin_privilege flag_admin_privilege  0
-LOAD reset_account_authorized 0
-RELOAD reset_account_authorized
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP enter_others_new_pin *
diff --git a/services/registration/enter_other_number_swa b/services/registration/enter_other_number_swa
deleted file mode 100644
index 214fc4a..0000000
--- a/services/registration/enter_other_number_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka nambari ya simu ili kutuma ombi la kubadilisha nambari ya siri:
\ No newline at end of file
diff --git a/services/registration/enter_others_new_pin b/services/registration/enter_others_new_pin
deleted file mode 100644
index 52ae664..0000000
--- a/services/registration/enter_others_new_pin
+++ /dev/null
@@ -1 +0,0 @@
-Please enter new PIN for: {{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/enter_others_new_pin.vis b/services/registration/enter_others_new_pin.vis
deleted file mode 100644
index 7711c97..0000000
--- a/services/registration/enter_others_new_pin.vis
+++ /dev/null
@@ -1,12 +0,0 @@
-LOAD validate_blocked_number 6
-RELOAD validate_blocked_number
-CATCH unregistered_number flag_unregistered_number 1
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-HALT 
-LOAD verify_new_pin 6
-RELOAD verify_new_pin
-INCMP _ 0
-INCMP * confirm_others_new_pin
diff --git a/services/registration/enter_others_new_pin_swa b/services/registration/enter_others_new_pin_swa
deleted file mode 100644
index 77ec2f3..0000000
--- a/services/registration/enter_others_new_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
\ No newline at end of file
diff --git a/services/registration/enter_pin b/services/registration/enter_pin
deleted file mode 100644
index cbb44ca..0000000
--- a/services/registration/enter_pin
+++ /dev/null
@@ -1 +0,0 @@
-Please enter your PIN:
\ No newline at end of file
diff --git a/services/registration/enter_pin.vis b/services/registration/enter_pin.vis
deleted file mode 100644
index 1217074..0000000
--- a/services/registration/enter_pin.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP display_profile_info *
diff --git a/services/registration/enter_pin_swa b/services/registration/enter_pin_swa
deleted file mode 100644
index bb30cfd..0000000
--- a/services/registration/enter_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka PIN yako
\ No newline at end of file
diff --git a/services/registration/exit_menu b/services/registration/exit_menu
deleted file mode 100644
index 1105a55..0000000
--- a/services/registration/exit_menu
+++ /dev/null
@@ -1 +0,0 @@
-Exit
\ No newline at end of file
diff --git a/services/registration/exit_menu_swa b/services/registration/exit_menu_swa
deleted file mode 100644
index 474f1ff..0000000
--- a/services/registration/exit_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ondoka
\ No newline at end of file
diff --git a/services/registration/female_menu b/services/registration/female_menu
deleted file mode 100644
index 18b94e5..0000000
--- a/services/registration/female_menu
+++ /dev/null
@@ -1 +0,0 @@
-Female
\ No newline at end of file
diff --git a/services/registration/female_menu_swa b/services/registration/female_menu_swa
deleted file mode 100644
index 0506300..0000000
--- a/services/registration/female_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Mwanamke
\ No newline at end of file
diff --git a/services/registration/help.vis b/services/registration/help.vis
deleted file mode 100644
index 6244d4d..0000000
--- a/services/registration/help.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-LOAD quit_with_help 0
-HALT
diff --git a/services/registration/help_menu b/services/registration/help_menu
deleted file mode 100644
index 0c64ced..0000000
--- a/services/registration/help_menu
+++ /dev/null
@@ -1 +0,0 @@
-Help
\ No newline at end of file
diff --git a/services/registration/help_menu_swa b/services/registration/help_menu_swa
deleted file mode 100644
index 393e0c8..0000000
--- a/services/registration/help_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Usaidizi
\ No newline at end of file
diff --git a/services/registration/incorrect_date_format b/services/registration/incorrect_date_format
deleted file mode 100644
index 56df792..0000000
--- a/services/registration/incorrect_date_format
+++ /dev/null
@@ -1,2 +0,0 @@
-The year of birth you entered is invalid.
-Please try again.
\ No newline at end of file
diff --git a/services/registration/incorrect_date_format.vis b/services/registration/incorrect_date_format.vis
deleted file mode 100644
index f4a8a2b..0000000
--- a/services/registration/incorrect_date_format.vis
+++ /dev/null
@@ -1,6 +0,0 @@
-LOAD reset_incorrect_date_format 8
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/incorrect_date_format_swa b/services/registration/incorrect_date_format_swa
deleted file mode 100644
index bd85f21..0000000
--- a/services/registration/incorrect_date_format_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Mwaka wa kuzaliwa ulioweka sio sahihi.
-Tafadhali jaribu tena.
\ No newline at end of file
diff --git a/services/registration/incorrect_pin b/services/registration/incorrect_pin
deleted file mode 100644
index 13a9562..0000000
--- a/services/registration/incorrect_pin
+++ /dev/null
@@ -1 +0,0 @@
-Incorrect PIN. You have: {{.reset_incorrect}} remaining attempt(s).
\ No newline at end of file
diff --git a/services/registration/incorrect_pin.vis b/services/registration/incorrect_pin.vis
deleted file mode 100644
index 167364a..0000000
--- a/services/registration/incorrect_pin.vis
+++ /dev/null
@@ -1,9 +0,0 @@
-LOAD reset_incorrect 0
-RELOAD reset_incorrect
-MAP reset_incorrect
-CATCH blocked_account flag_account_blocked 1
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/incorrect_pin_swa b/services/registration/incorrect_pin_swa
deleted file mode 100644
index ed22beb..0000000
--- a/services/registration/incorrect_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-PIN ulioeka sio sahihi, una majaribio: {{.reset_incorrect}} yaliyobaki
\ No newline at end of file
diff --git a/services/registration/invalid_amount b/services/registration/invalid_amount
deleted file mode 100644
index c4bbe3f..0000000
--- a/services/registration/invalid_amount
+++ /dev/null
@@ -1 +0,0 @@
-Amount {{.validate_amount}} is invalid, please try again:
\ No newline at end of file
diff --git a/services/registration/invalid_amount.vis b/services/registration/invalid_amount.vis
deleted file mode 100644
index d5b5f03..0000000
--- a/services/registration/invalid_amount.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-MAP validate_amount
-RELOAD reset_transaction_amount
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/invalid_amount_swa b/services/registration/invalid_amount_swa
deleted file mode 100644
index 836d7b2..0000000
--- a/services/registration/invalid_amount_swa
+++ /dev/null
@@ -1 +0,0 @@
-Kiwango {{.validate_amount}} sio sahihi, tafadhali weka tena:
\ No newline at end of file
diff --git a/services/registration/invalid_others_pin b/services/registration/invalid_others_pin
deleted file mode 100644
index acdf45f..0000000
--- a/services/registration/invalid_others_pin
+++ /dev/null
@@ -1 +0,0 @@
-The PIN you have entered is invalid.Please try a 4 digit number instead.
\ No newline at end of file
diff --git a/services/registration/invalid_others_pin.vis b/services/registration/invalid_others_pin.vis
deleted file mode 100644
index d218e6d..0000000
--- a/services/registration/invalid_others_pin.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP enter_others_new_pin 1
-INCMP quit 9
diff --git a/services/registration/invalid_pin b/services/registration/invalid_pin
deleted file mode 100644
index dd984ea..0000000
--- a/services/registration/invalid_pin
+++ /dev/null
@@ -1 +0,0 @@
-The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885
\ No newline at end of file
diff --git a/services/registration/invalid_pin.vis b/services/registration/invalid_pin.vis
deleted file mode 100644
index 3790a08..0000000
--- a/services/registration/invalid_pin.vis
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUT back 0
-HALT
-INCMP _ 0
diff --git a/services/registration/invalid_pin_swa b/services/registration/invalid_pin_swa
deleted file mode 100644
index 7512242..0000000
--- a/services/registration/invalid_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
diff --git a/services/registration/invalid_recipient b/services/registration/invalid_recipient
deleted file mode 100644
index d9fcb1d..0000000
--- a/services/registration/invalid_recipient
+++ /dev/null
@@ -1 +0,0 @@
-{{.validate_recipient}} is invalid, please try again:
\ No newline at end of file
diff --git a/services/registration/invalid_recipient.vis b/services/registration/invalid_recipient.vis
deleted file mode 100644
index 09efdde..0000000
--- a/services/registration/invalid_recipient.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-MAP validate_recipient
-RELOAD transaction_reset
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/invalid_recipient_swa b/services/registration/invalid_recipient_swa
deleted file mode 100644
index 13dda97..0000000
--- a/services/registration/invalid_recipient_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.validate_recipient}} sio sahihi, tafadhali weka tena:
\ No newline at end of file
diff --git a/services/registration/invite_menu b/services/registration/invite_menu
deleted file mode 100644
index e44862a..0000000
--- a/services/registration/invite_menu
+++ /dev/null
@@ -1 +0,0 @@
-Invite to Sarafu Network
\ No newline at end of file
diff --git a/services/registration/invite_menu_swa b/services/registration/invite_menu_swa
deleted file mode 100644
index 48c0ddf..0000000
--- a/services/registration/invite_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Karibisha kwa matandao wa Sarafu
\ No newline at end of file
diff --git a/services/registration/invite_recipient b/services/registration/invite_recipient
deleted file mode 100644
index aa3438d..0000000
--- a/services/registration/invite_recipient
+++ /dev/null
@@ -1 +0,0 @@
-{{.validate_recipient}} is not registered, please try again:
\ No newline at end of file
diff --git a/services/registration/invite_recipient.vis b/services/registration/invite_recipient.vis
deleted file mode 100644
index 1a4845f..0000000
--- a/services/registration/invite_recipient.vis
+++ /dev/null
@@ -1,8 +0,0 @@
-MAP validate_recipient
-MOUT retry 1
-MOUT invite 2
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP invite_result 2
-INCMP quit 9
diff --git a/services/registration/invite_recipient_swa b/services/registration/invite_recipient_swa
deleted file mode 100644
index 30cf599..0000000
--- a/services/registration/invite_recipient_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:
\ No newline at end of file
diff --git a/services/registration/invite_result.vis b/services/registration/invite_result.vis
deleted file mode 100644
index 5f31749..0000000
--- a/services/registration/invite_result.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-LOAD invite_valid_recipient 0
-HALT
diff --git a/services/registration/kiswahili_menu b/services/registration/kiswahili_menu
deleted file mode 100644
index e4d88a5..0000000
--- a/services/registration/kiswahili_menu
+++ /dev/null
@@ -1 +0,0 @@
-Kiswahili
\ No newline at end of file
diff --git a/services/registration/language_changed b/services/registration/language_changed
deleted file mode 100644
index 839a631..0000000
--- a/services/registration/language_changed
+++ /dev/null
@@ -1 +0,0 @@
-Your language change request was successful.
\ No newline at end of file
diff --git a/services/registration/language_changed.vis b/services/registration/language_changed.vis
deleted file mode 100644
index 832ef22..0000000
--- a/services/registration/language_changed.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/language_changed_swa b/services/registration/language_changed_swa
deleted file mode 100644
index 4a7f03b..0000000
--- a/services/registration/language_changed_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ombi lako la kubadilisha lugha limefanikiwa.
\ No newline at end of file
diff --git a/services/registration/list_offering b/services/registration/list_offering
deleted file mode 100644
index e69de29..0000000
diff --git a/services/registration/list_offering.vis b/services/registration/list_offering.vis
deleted file mode 100644
index e69de29..0000000
diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po
deleted file mode 100644
index 6155063..0000000
--- a/services/registration/locale/swa/default.po
+++ /dev/null
@@ -1,32 +0,0 @@
-msgid "Your account balance is %s"
-msgstr "Salio lako ni %s"
-
-msgid "Your request has been sent. %s will receive %s %s from %s."
-msgstr "Ombi lako limetumwa. %s atapokea %s %s kutoka kwa %s."
-
-msgid "Thank you for using Sarafu. Goodbye!"
-msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
-
-msgid "For more help, please call: 0757628885"
-msgstr "Kwa usaidizi zaidi, piga: 0757628885"
-
-msgid "Your account has been locked. For help on how to unblock your account, contact support at: 0757628885"
-msgstr "Akaunti yako imefungwa. Kwa usaidizi wa jinsi ya kufungua akaunti yako, wasiliana na usaidizi kwa: 0757628885"
-
-msgid "Balance: %s\n"
-msgstr "Salio: %s\n"
-
-msgid "Your invite request for %s to Sarafu Network failed. Please try again later."
-msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
-
-msgid "Your invitation to %s to join Sarafu Network has been sent."
-msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu limetumwa."
-
-msgid "Your request failed. Please try again later."
-msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
-
-msgid "Community Balance: 0.00"
-msgstr "Salio la Kikundi: 0.00"
-
-msgid "Symbol: %s\nBalance: %s"
-msgstr "Sarafu: %s\nSalio: %s"
diff --git a/services/registration/main b/services/registration/main
deleted file mode 100644
index afae8c1..0000000
--- a/services/registration/main
+++ /dev/null
@@ -1 +0,0 @@
-{{.check_balance}}
\ No newline at end of file
diff --git a/services/registration/main.vis b/services/registration/main.vis
deleted file mode 100644
index 2982f47..0000000
--- a/services/registration/main.vis
+++ /dev/null
@@ -1,20 +0,0 @@
-LOAD set_default_voucher 8
-RELOAD set_default_voucher
-LOAD check_vouchers 10
-RELOAD check_vouchers
-LOAD check_balance 128
-RELOAD check_balance
-CATCH api_failure flag_api_call_error 1
-MAP check_balance
-MOUT send 1
-MOUT vouchers 2
-MOUT account 3
-MOUT help 4
-MOUT quit 9
-HALT
-INCMP send 1
-INCMP my_vouchers 2
-INCMP my_account 3
-INCMP help 4
-INCMP quit 9
-INCMP . *
diff --git a/services/registration/main_swa b/services/registration/main_swa
deleted file mode 100644
index afae8c1..0000000
--- a/services/registration/main_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.check_balance}}
\ No newline at end of file
diff --git a/services/registration/male_menu b/services/registration/male_menu
deleted file mode 100644
index 183883f..0000000
--- a/services/registration/male_menu
+++ /dev/null
@@ -1 +0,0 @@
-Male
\ No newline at end of file
diff --git a/services/registration/male_menu_swa b/services/registration/male_menu_swa
deleted file mode 100644
index 7afdee9..0000000
--- a/services/registration/male_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Mwanaume
\ No newline at end of file
diff --git a/services/registration/my_account b/services/registration/my_account
deleted file mode 100644
index 7aa9fe9..0000000
--- a/services/registration/my_account
+++ /dev/null
@@ -1 +0,0 @@
-My Account
\ No newline at end of file
diff --git a/services/registration/my_account.vis b/services/registration/my_account.vis
deleted file mode 100644
index e3956d2..0000000
--- a/services/registration/my_account.vis
+++ /dev/null
@@ -1,17 +0,0 @@
-LOAD reset_allow_update 0
-MOUT profile 1
-MOUT change_language 2
-MOUT check_balance 3
-MOUT check_statement 4
-MOUT pin_options 5
-MOUT my_address 6
-MOUT back 0
-HALT
-INCMP main 0
-INCMP edit_profile 1
-INCMP change_language 2
-INCMP balances 3
-INCMP check_statement 4
-INCMP pin_management 5
-INCMP address 6
-INCMP . *
diff --git a/services/registration/my_account_swa b/services/registration/my_account_swa
deleted file mode 100644
index c77102f..0000000
--- a/services/registration/my_account_swa
+++ /dev/null
@@ -1 +0,0 @@
-Akaunti yangu
\ No newline at end of file
diff --git a/services/registration/my_address_menu b/services/registration/my_address_menu
deleted file mode 100644
index 5c13a7d..0000000
--- a/services/registration/my_address_menu
+++ /dev/null
@@ -1 +0,0 @@
-My Address
\ No newline at end of file
diff --git a/services/registration/my_address_menu_swa b/services/registration/my_address_menu_swa
deleted file mode 100644
index 531bc4e..0000000
--- a/services/registration/my_address_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Anwani yangu
\ No newline at end of file
diff --git a/services/registration/my_balance b/services/registration/my_balance
deleted file mode 100644
index afae8c1..0000000
--- a/services/registration/my_balance
+++ /dev/null
@@ -1 +0,0 @@
-{{.check_balance}}
\ No newline at end of file
diff --git a/services/registration/my_balance.vis b/services/registration/my_balance.vis
deleted file mode 100644
index b6094c0..0000000
--- a/services/registration/my_balance.vis
+++ /dev/null
@@ -1,12 +0,0 @@
-LOAD reset_incorrect 6
-LOAD check_balance 0
-CATCH api_failure  flag_api_call_error  1
-MAP check_balance
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9
-INCMP . * 
diff --git a/services/registration/my_balance_menu b/services/registration/my_balance_menu
deleted file mode 100644
index fdd930b..0000000
--- a/services/registration/my_balance_menu
+++ /dev/null
@@ -1 +0,0 @@
-My balance
\ No newline at end of file
diff --git a/services/registration/my_balance_menu_swa b/services/registration/my_balance_menu_swa
deleted file mode 100644
index 810c386..0000000
--- a/services/registration/my_balance_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Salio langu
\ No newline at end of file
diff --git a/services/registration/my_balance_swa b/services/registration/my_balance_swa
deleted file mode 100644
index afae8c1..0000000
--- a/services/registration/my_balance_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.check_balance}}
\ No newline at end of file
diff --git a/services/registration/my_vouchers b/services/registration/my_vouchers
deleted file mode 100644
index 548de9c..0000000
--- a/services/registration/my_vouchers
+++ /dev/null
@@ -1 +0,0 @@
-My vouchers
\ No newline at end of file
diff --git a/services/registration/my_vouchers.vis b/services/registration/my_vouchers.vis
deleted file mode 100644
index e79438e..0000000
--- a/services/registration/my_vouchers.vis
+++ /dev/null
@@ -1,9 +0,0 @@
-LOAD reset_account_authorized 16
-RELOAD reset_account_authorized
-MOUT select_voucher 1
-MOUT voucher_details 2
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP select_voucher 1
-INCMP voucher_details 2
diff --git a/services/registration/new_pin b/services/registration/new_pin
deleted file mode 100644
index 65d8ed3..0000000
--- a/services/registration/new_pin
+++ /dev/null
@@ -1 +0,0 @@
-Enter a new four number PIN:
diff --git a/services/registration/new_pin.vis b/services/registration/new_pin.vis
deleted file mode 100644
index 29013a9..0000000
--- a/services/registration/new_pin.vis
+++ /dev/null
@@ -1,13 +0,0 @@
-LOAD authorize_account 12
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH old_pin flag_allow_update 0
-MOUT back 0
-HALT
-INCMP _ 0
-LOAD save_temporary_pin 6
-LOAD verify_new_pin 0
-RELOAD save_temporary_pin
-RELOAD verify_new_pin
-INCMP * confirm_pin_change
-
diff --git a/services/registration/new_pin_swa b/services/registration/new_pin_swa
deleted file mode 100644
index 1ec32d9..0000000
--- a/services/registration/new_pin_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Weka PIN mpya ya nne nambari: 
-
diff --git a/services/registration/next_menu b/services/registration/next_menu
deleted file mode 100644
index e2e838e..0000000
--- a/services/registration/next_menu
+++ /dev/null
@@ -1 +0,0 @@
-Next
\ No newline at end of file
diff --git a/services/registration/next_menu_swa b/services/registration/next_menu_swa
deleted file mode 100644
index 6511e40..0000000
--- a/services/registration/next_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Mbele
\ No newline at end of file
diff --git a/services/registration/no_admin_privilege b/services/registration/no_admin_privilege
deleted file mode 100644
index 27901dc..0000000
--- a/services/registration/no_admin_privilege
+++ /dev/null
@@ -1 +0,0 @@
-You do not have privileges to perform this action
diff --git a/services/registration/no_admin_privilege.vis b/services/registration/no_admin_privilege.vis
deleted file mode 100644
index 3cf1e4c..0000000
--- a/services/registration/no_admin_privilege.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT quit 9
-MOUT back 0
-HALT
-INCMP pin_management 0
-INCMP quit 9
diff --git a/services/registration/no_admin_privilege_swa b/services/registration/no_admin_privilege_swa
deleted file mode 100644
index 6c6d3dc..0000000
--- a/services/registration/no_admin_privilege_swa
+++ /dev/null
@@ -1 +0,0 @@
-Huna mapendeleo ya kufanya kitendo hiki
\ No newline at end of file
diff --git a/services/registration/no_menu b/services/registration/no_menu
deleted file mode 100644
index 289cc91..0000000
--- a/services/registration/no_menu
+++ /dev/null
@@ -1 +0,0 @@
-No
\ No newline at end of file
diff --git a/services/registration/no_menu_swa b/services/registration/no_menu_swa
deleted file mode 100644
index a9d6b8d..0000000
--- a/services/registration/no_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-La
\ No newline at end of file
diff --git a/services/registration/no_transfers b/services/registration/no_transfers
deleted file mode 100644
index 3439806..0000000
--- a/services/registration/no_transfers
+++ /dev/null
@@ -1 +0,0 @@
-No transfers history
\ No newline at end of file
diff --git a/services/registration/no_transfers.vis b/services/registration/no_transfers.vis
deleted file mode 100644
index 832ef22..0000000
--- a/services/registration/no_transfers.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/no_transfers_swa b/services/registration/no_transfers_swa
deleted file mode 100644
index 1f82e82..0000000
--- a/services/registration/no_transfers_swa
+++ /dev/null
@@ -1 +0,0 @@
-Hakuna historia kwa akaunti yako
\ No newline at end of file
diff --git a/services/registration/no_voucher b/services/registration/no_voucher
deleted file mode 100644
index 6303197..0000000
--- a/services/registration/no_voucher
+++ /dev/null
@@ -1 +0,0 @@
-You need a voucher to proceed
\ No newline at end of file
diff --git a/services/registration/no_voucher.vis b/services/registration/no_voucher.vis
deleted file mode 100644
index 832ef22..0000000
--- a/services/registration/no_voucher.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/no_voucher_swa b/services/registration/no_voucher_swa
deleted file mode 100644
index 7291650..0000000
--- a/services/registration/no_voucher_swa
+++ /dev/null
@@ -1 +0,0 @@
-Unahitaji sarafu kuendelea
\ No newline at end of file
diff --git a/services/registration/old_pin b/services/registration/old_pin
deleted file mode 100644
index 2c64d42..0000000
--- a/services/registration/old_pin
+++ /dev/null
@@ -1 +0,0 @@
-Enter your old PIN
diff --git a/services/registration/old_pin.vis b/services/registration/old_pin.vis
deleted file mode 100644
index 1e99f4f..0000000
--- a/services/registration/old_pin.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-LOAD reset_allow_update 0
-MOUT back 0
-HALT
-RELOAD reset_allow_update
-INCMP _ 0
-INCMP new_pin *
-
diff --git a/services/registration/old_pin_swa b/services/registration/old_pin_swa
deleted file mode 100644
index 312b597..0000000
--- a/services/registration/old_pin_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka PIN yako ya zamani:
diff --git a/services/registration/others_pin_mismatch b/services/registration/others_pin_mismatch
deleted file mode 100644
index deb9fe5..0000000
--- a/services/registration/others_pin_mismatch
+++ /dev/null
@@ -1 +0,0 @@
-The PIN you have entered is not a match
diff --git a/services/registration/others_pin_mismatch.vis b/services/registration/others_pin_mismatch.vis
deleted file mode 100644
index 37b3deb..0000000
--- a/services/registration/others_pin_mismatch.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP _ 1
-INCMP quit 9
diff --git a/services/registration/others_pin_mismatch_swa b/services/registration/others_pin_mismatch_swa
deleted file mode 100644
index 5787790..0000000
--- a/services/registration/others_pin_mismatch_swa
+++ /dev/null
@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
\ No newline at end of file
diff --git a/services/registration/pin_entry b/services/registration/pin_entry
deleted file mode 100644
index cbb44ca..0000000
--- a/services/registration/pin_entry
+++ /dev/null
@@ -1 +0,0 @@
-Please enter your PIN:
\ No newline at end of file
diff --git a/services/registration/pin_entry.vis b/services/registration/pin_entry.vis
deleted file mode 100644
index 2eaf40f..0000000
--- a/services/registration/pin_entry.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD authorize_account 0
-HALT
-RELOAD authorize_account
-MOVE _
diff --git a/services/registration/pin_entry_swa b/services/registration/pin_entry_swa
deleted file mode 100644
index 1b5e646..0000000
--- a/services/registration/pin_entry_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tafadhali weka PIN yako
\ No newline at end of file
diff --git a/services/registration/pin_management b/services/registration/pin_management
deleted file mode 100644
index b60e816..0000000
--- a/services/registration/pin_management
+++ /dev/null
@@ -1 +0,0 @@
-PIN Management
\ No newline at end of file
diff --git a/services/registration/pin_management.vis b/services/registration/pin_management.vis
deleted file mode 100644
index 5eb7d5a..0000000
--- a/services/registration/pin_management.vis
+++ /dev/null
@@ -1,8 +0,0 @@
-MOUT change_pin 1
-MOUT reset_pin 2
-MOUT back 0
-HALT
-INCMP my_account 0
-INCMP old_pin  1
-INCMP enter_other_number 2
-INCMP . *
diff --git a/services/registration/pin_management_swa b/services/registration/pin_management_swa
deleted file mode 100644
index e69de29..0000000
diff --git a/services/registration/pin_options_menu b/services/registration/pin_options_menu
deleted file mode 100644
index 778d28d..0000000
--- a/services/registration/pin_options_menu
+++ /dev/null
@@ -1 +0,0 @@
-PIN options
\ No newline at end of file
diff --git a/services/registration/pin_options_menu_swa b/services/registration/pin_options_menu_swa
deleted file mode 100644
index e47ca0f..0000000
--- a/services/registration/pin_options_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Mipangilio ya PIN
\ No newline at end of file
diff --git a/services/registration/pin_reset_mismatch b/services/registration/pin_reset_mismatch
deleted file mode 100644
index dc0236b..0000000
--- a/services/registration/pin_reset_mismatch
+++ /dev/null
@@ -1 +0,0 @@
-The PIN is not a match. Try again
diff --git a/services/registration/pin_reset_mismatch.vis b/services/registration/pin_reset_mismatch.vis
deleted file mode 100644
index 5dc7e7c..0000000
--- a/services/registration/pin_reset_mismatch.vis
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUT retry 1
-MOUT quit 9
-HALT
-INCMP confirm_pin_change 1
-INCMP quit 9
-
diff --git a/services/registration/pin_reset_mismatch_swa b/services/registration/pin_reset_mismatch_swa
deleted file mode 100644
index 5787790..0000000
--- a/services/registration/pin_reset_mismatch_swa
+++ /dev/null
@@ -1 +0,0 @@
-PIN uliyoweka hailingani.Jaribu tena.
\ No newline at end of file
diff --git a/services/registration/pin_reset_result b/services/registration/pin_reset_result
deleted file mode 100644
index 60554b9..0000000
--- a/services/registration/pin_reset_result
+++ /dev/null
@@ -1 +0,0 @@
-PIN reset request for {{.retrieve_blocked_number}} was successful
\ No newline at end of file
diff --git a/services/registration/pin_reset_result.vis b/services/registration/pin_reset_result.vis
deleted file mode 100644
index 34b9789..0000000
--- a/services/registration/pin_reset_result.vis
+++ /dev/null
@@ -1,8 +0,0 @@
-LOAD retrieve_blocked_number 0
-MAP retrieve_blocked_number
-LOAD reset_others_pin 6
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP pin_management 0
-INCMP quit  9
diff --git a/services/registration/pin_reset_result_swa b/services/registration/pin_reset_result_swa
deleted file mode 100644
index 30de04e..0000000
--- a/services/registration/pin_reset_result_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ombi la kuweka upya PIN ya {{.retrieve_blocked_number}} limefanikiwa
\ No newline at end of file
diff --git a/services/registration/pin_reset_success b/services/registration/pin_reset_success
deleted file mode 100644
index e9326ec..0000000
--- a/services/registration/pin_reset_success
+++ /dev/null
@@ -1 +0,0 @@
-Your PIN change request has been successful
diff --git a/services/registration/pin_reset_success.vis b/services/registration/pin_reset_success.vis
deleted file mode 100644
index 96dee73..0000000
--- a/services/registration/pin_reset_success.vis
+++ /dev/null
@@ -1,8 +0,0 @@
-LOAD confirm_pin_change 0
-RELOAD confirm_pin_change
-CATCH pin_reset_mismatch  flag_pin_mismatch 1
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP main 0
-INCMP quit 9
diff --git a/services/registration/pin_reset_success_swa b/services/registration/pin_reset_success_swa
deleted file mode 100644
index af69b9f..0000000
--- a/services/registration/pin_reset_success_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ombi lako la kubadili PIN limefanikiwa
diff --git a/services/registration/pp.csv b/services/registration/pp.csv
deleted file mode 100644
index aa1eb05..0000000
--- a/services/registration/pp.csv
+++ /dev/null
@@ -1,32 +0,0 @@
-flag,flag_language_set,8,checks whether the user has set their prefered language
-flag,flag_account_created,9,this is set when an account has been created on the API
-flag,flag_account_creation_failed,10,this is set when there's an error from the API during account creation
-flag,flag_account_pending,11,this is set when an account does not have a status of SUCCESS
-flag,flag_account_success,12,this is set when an account has a status of SUCCESS
-flag,flag_pin_mismatch,13,this is set when the confirmation PIN matches the initial PIN during registration
-flag,flag_pin_set,14,this is set when a newly registered user sets a PIN. This must be present for an account to access the main menu
-flag,flag_account_authorized,15,this is set to allow a user access guarded nodes after providing a correct PIN
-flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
-flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
-flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
-flag,flag_valid_pin,20,this is set when the given PIN is valid
-flag,flag_allow_update,21,this is set to allow a user to update their profile data
-flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
-flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid
-flag,flag_incorrect_voucher,24,this is set when the selected voucher is invalid
-flag,flag_api_call_error,25,this is set when communication to an external service fails
-flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
-flag,flag_admin_privilege,27,this is set when a user has admin privileges.
-flag,flag_unregistered_number,28,this is set when an unregistered phonenumber tries to perform an action
-flag,flag_no_transfers,29,this is set when a user does not have any transactions
-flag,flag_incorrect_statement,30,this is set when the selected statement is invalid
-flag,flag_firstname_set,31,this is set when the first name of the profile is set
-flag,flag_familyname_set,32,this is set when the family name of the profile is set
-flag,flag_yob_set,33,this is set when the yob of the profile is set
-flag,flag_gender_set,34,this is set when the gender of the profile is set
-flag,flag_location_set,35,this is set when the location of the profile is set
-flag,flag_offerings_set,36,this is set when the offerings of the profile is set
-flag,flag_back_set,37,this is set when it is a back navigation
-flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
-
diff --git a/services/registration/prev_menu b/services/registration/prev_menu
deleted file mode 100644
index 72d90d8..0000000
--- a/services/registration/prev_menu
+++ /dev/null
@@ -1 +0,0 @@
-Prev
\ No newline at end of file
diff --git a/services/registration/prev_menu_swa b/services/registration/prev_menu_swa
deleted file mode 100644
index e5a3e45..0000000
--- a/services/registration/prev_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Nyuma
\ No newline at end of file
diff --git a/services/registration/profile_menu b/services/registration/profile_menu
deleted file mode 100644
index 0d6af58..0000000
--- a/services/registration/profile_menu
+++ /dev/null
@@ -1 +0,0 @@
-Profile
\ No newline at end of file
diff --git a/services/registration/profile_menu_swa b/services/registration/profile_menu_swa
deleted file mode 100644
index 8a12b7d..0000000
--- a/services/registration/profile_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Wasifu wangu
\ No newline at end of file
diff --git a/services/registration/profile_update_success b/services/registration/profile_update_success
deleted file mode 100644
index 652942a..0000000
--- a/services/registration/profile_update_success
+++ /dev/null
@@ -1 +0,0 @@
-Profile updated successfully
diff --git a/services/registration/profile_update_success.vis b/services/registration/profile_update_success.vis
deleted file mode 100644
index f670e6e..0000000
--- a/services/registration/profile_update_success.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-LOAD update_all_profile_items 0
-RELOAD update_all_profile_items
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP edit_profile 0
-INCMP quit 9
diff --git a/services/registration/profile_update_success_swa b/services/registration/profile_update_success_swa
deleted file mode 100644
index df0af2c..0000000
--- a/services/registration/profile_update_success_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ombi la Kuweka wasifu limefanikiwa
diff --git a/services/registration/quit.vis b/services/registration/quit.vis
deleted file mode 100644
index 0c8bb46..0000000
--- a/services/registration/quit.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-LOAD quit 0
-HALT
diff --git a/services/registration/quit_menu b/services/registration/quit_menu
deleted file mode 100644
index f3f23ca..0000000
--- a/services/registration/quit_menu
+++ /dev/null
@@ -1 +0,0 @@
-Quit
\ No newline at end of file
diff --git a/services/registration/quit_menu_swa b/services/registration/quit_menu_swa
deleted file mode 100644
index 474f1ff..0000000
--- a/services/registration/quit_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ondoka
\ No newline at end of file
diff --git a/services/registration/reset_pin_menu b/services/registration/reset_pin_menu
deleted file mode 100644
index 1f5d676..0000000
--- a/services/registration/reset_pin_menu
+++ /dev/null
@@ -1 +0,0 @@
-Reset other's PIN
\ No newline at end of file
diff --git a/services/registration/reset_pin_menu_swa b/services/registration/reset_pin_menu_swa
deleted file mode 100644
index 49214fe..0000000
--- a/services/registration/reset_pin_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Badili PIN ya mwenzio
\ No newline at end of file
diff --git a/services/registration/retry_menu b/services/registration/retry_menu
deleted file mode 100644
index ffde86c..0000000
--- a/services/registration/retry_menu
+++ /dev/null
@@ -1 +0,0 @@
-Retry
\ No newline at end of file
diff --git a/services/registration/retry_menu_swa b/services/registration/retry_menu_swa
deleted file mode 100644
index c43b419..0000000
--- a/services/registration/retry_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Jaribu tena
\ No newline at end of file
diff --git a/services/registration/root b/services/registration/root
deleted file mode 100644
index 3928a82..0000000
--- a/services/registration/root
+++ /dev/null
@@ -1 +0,0 @@
-Welcome to Sarafu Network
\ No newline at end of file
diff --git a/services/registration/root.vis b/services/registration/root.vis
deleted file mode 100644
index 102e6e5..0000000
--- a/services/registration/root.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-CATCH blocked_account flag_account_blocked 1
-CATCH select_language flag_language_set 0
-CATCH terms flag_account_created 0
-LOAD check_account_status 0
-RELOAD check_account_status
-CATCH api_failure  flag_api_call_error  1
-CATCH account_pending flag_account_pending 1
-CATCH create_pin flag_pin_set 0
-CATCH main flag_account_success 1
-HALT
diff --git a/services/registration/root_swa b/services/registration/root_swa
deleted file mode 100644
index 75bb624..0000000
--- a/services/registration/root_swa
+++ /dev/null
@@ -1 +0,0 @@
-Karibu Sarafu Network
\ No newline at end of file
diff --git a/services/registration/select_gender b/services/registration/select_gender
deleted file mode 100644
index 22b9be9..0000000
--- a/services/registration/select_gender
+++ /dev/null
@@ -1,2 +0,0 @@
-Current gender: {{.get_current_profile_info}}
-Select gender: 
\ No newline at end of file
diff --git a/services/registration/select_gender.vis b/services/registration/select_gender.vis
deleted file mode 100644
index e41da10..0000000
--- a/services/registration/select_gender.vis
+++ /dev/null
@@ -1,14 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD get_current_profile_info 0
-RELOAD get_current_profile_info
-MOUT male 1
-MOUT female 2
-MOUT unspecified 3
-MOUT back 0
-HALT
-INCMP _ 0
-INCMP set_male 1
-INCMP set_female 2
-INCMP set_unspecified 3
-INCMP . *
diff --git a/services/registration/select_gender_swa b/services/registration/select_gender_swa
deleted file mode 100644
index 39d99d5..0000000
--- a/services/registration/select_gender_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Jinsia ya sasa: {{.get_current_profile_info}}
-Chagua jinsia
\ No newline at end of file
diff --git a/services/registration/select_language b/services/registration/select_language
deleted file mode 100644
index b3d4304..0000000
--- a/services/registration/select_language
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to Sarafu Network
-Please select a language
\ No newline at end of file
diff --git a/services/registration/select_language.vis b/services/registration/select_language.vis
deleted file mode 100644
index 0f7f298..0000000
--- a/services/registration/select_language.vis
+++ /dev/null
@@ -1,6 +0,0 @@
-MOUT english 1
-MOUT kiswahili 2
-HALT
-INCMP set_eng 1
-INCMP set_swa 2
-INCMP . *
diff --git a/services/registration/select_voucher b/services/registration/select_voucher
deleted file mode 100644
index 084b9b8..0000000
--- a/services/registration/select_voucher
+++ /dev/null
@@ -1,2 +0,0 @@
-Select number or symbol from your vouchers:
-{{.get_vouchers}}
\ No newline at end of file
diff --git a/services/registration/select_voucher.vis b/services/registration/select_voucher.vis
deleted file mode 100644
index 058d791..0000000
--- a/services/registration/select_voucher.vis
+++ /dev/null
@@ -1,16 +0,0 @@
-CATCH no_voucher flag_no_active_voucher 1
-LOAD get_vouchers 0
-MAP get_vouchers
-MOUT back 0
-MOUT quit 99
-MNEXT next 11
-MPREV prev 22
-HALT
-LOAD view_voucher 80
-RELOAD view_voucher
-CATCH . flag_incorrect_voucher 1
-INCMP _ 0
-INCMP quit 99
-INCMP > 11
-INCMP < 22
-INCMP view_voucher *
diff --git a/services/registration/select_voucher_menu b/services/registration/select_voucher_menu
deleted file mode 100644
index 8ee06df..0000000
--- a/services/registration/select_voucher_menu
+++ /dev/null
@@ -1 +0,0 @@
-Select voucher
\ No newline at end of file
diff --git a/services/registration/select_voucher_menu_swa b/services/registration/select_voucher_menu_swa
deleted file mode 100644
index 2cb4daf..0000000
--- a/services/registration/select_voucher_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Chagua Sarafu
\ No newline at end of file
diff --git a/services/registration/select_voucher_swa b/services/registration/select_voucher_swa
deleted file mode 100644
index b4720bf..0000000
--- a/services/registration/select_voucher_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Chagua nambari au ishara kutoka kwa salio zako:
-{{.get_vouchers}}
\ No newline at end of file
diff --git a/services/registration/send b/services/registration/send
deleted file mode 100644
index 306466c..0000000
--- a/services/registration/send
+++ /dev/null
@@ -1 +0,0 @@
-Enter recipient's phone number/address/alias:
\ No newline at end of file
diff --git a/services/registration/send.vis b/services/registration/send.vis
deleted file mode 100644
index 8928725..0000000
--- a/services/registration/send.vis
+++ /dev/null
@@ -1,11 +0,0 @@
-LOAD transaction_reset 0
-RELOAD transaction_reset
-CATCH no_voucher flag_no_active_voucher 1
-MOUT back 0
-HALT
-LOAD validate_recipient 20
-RELOAD validate_recipient
-CATCH invalid_recipient flag_invalid_recipient 1
-CATCH invite_recipient flag_invalid_recipient_with_invite 1
-INCMP _ 0
-INCMP amount *
diff --git a/services/registration/send_menu b/services/registration/send_menu
deleted file mode 100644
index 5f5a837..0000000
--- a/services/registration/send_menu
+++ /dev/null
@@ -1 +0,0 @@
-Send
\ No newline at end of file
diff --git a/services/registration/send_menu_swa b/services/registration/send_menu_swa
deleted file mode 100644
index 605c8e8..0000000
--- a/services/registration/send_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Tuma
\ No newline at end of file
diff --git a/services/registration/send_swa b/services/registration/send_swa
deleted file mode 100644
index 016760e..0000000
--- a/services/registration/send_swa
+++ /dev/null
@@ -1 +0,0 @@
-Weka nambari ya simu:
\ No newline at end of file
diff --git a/services/registration/set_default.vis b/services/registration/set_default.vis
deleted file mode 100644
index b66a1b7..0000000
--- a/services/registration/set_default.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD set_language 6
-RELOAD set_language
-CATCH terms flag_account_created 0
-MOVE language_changed
diff --git a/services/registration/set_eng.vis b/services/registration/set_eng.vis
deleted file mode 100644
index b66a1b7..0000000
--- a/services/registration/set_eng.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD set_language 6
-RELOAD set_language
-CATCH terms flag_account_created 0
-MOVE language_changed
diff --git a/services/registration/set_female.vis b/services/registration/set_female.vis
deleted file mode 100644
index da92520..0000000
--- a/services/registration/set_female.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD save_gender 32
-RELOAD save_gender
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob
diff --git a/services/registration/set_male.vis b/services/registration/set_male.vis
deleted file mode 100644
index 9a95937..0000000
--- a/services/registration/set_male.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD save_gender 16
-RELOAD save_gender
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob
diff --git a/services/registration/set_swa.vis b/services/registration/set_swa.vis
deleted file mode 100644
index b66a1b7..0000000
--- a/services/registration/set_swa.vis
+++ /dev/null
@@ -1,4 +0,0 @@
-LOAD set_language 6
-RELOAD set_language
-CATCH terms flag_account_created 0
-MOVE language_changed
diff --git a/services/registration/set_unspecified.vis b/services/registration/set_unspecified.vis
deleted file mode 100644
index 824105c..0000000
--- a/services/registration/set_unspecified.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD save_gender 8
-RELOAD save_gender
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH update_gender flag_allow_update 1
-CATCH pin_entry flag_gender_set 1
-CATCH edit_yob flag_yob_set 0
-CATCH edit_location flag_location_set 0
-CATCH edit_offerings flag_offerings_set 0
-CATCH pin_entry flag_gender_set 0
-MOVE edit_yob
diff --git a/services/registration/terms b/services/registration/terms
deleted file mode 100644
index 8af5b06..0000000
--- a/services/registration/terms
+++ /dev/null
@@ -1,2 +0,0 @@
-Do you agree to terms and conditions?
-https://grassecon.org/pages/terms-and-conditions
diff --git a/services/registration/terms.vis b/services/registration/terms.vis
deleted file mode 100644
index 372b6ca..0000000
--- a/services/registration/terms.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT yes 1
-MOUT no 2
-HALT
-INCMP create_pin 1
-INCMP quit *
diff --git a/services/registration/terms_swa b/services/registration/terms_swa
deleted file mode 100644
index 5678186..0000000
--- a/services/registration/terms_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Kwa kutumia hii huduma umekubali sheria na masharti?
-https://grassecon.org/pages/terms-and-conditions
diff --git a/services/registration/transaction_initiated.vis b/services/registration/transaction_initiated.vis
deleted file mode 100644
index f8cf19c..0000000
--- a/services/registration/transaction_initiated.vis
+++ /dev/null
@@ -1,11 +0,0 @@
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
-RELOAD get_amount
-MAP get_amount
-RELOAD get_recipient
-MAP get_recipient
-RELOAD get_sender
-MAP get_sender
-LOAD initiate_transaction 0
-HALT
diff --git a/services/registration/transaction_pin b/services/registration/transaction_pin
deleted file mode 100644
index a1b7125..0000000
--- a/services/registration/transaction_pin
+++ /dev/null
@@ -1,2 +0,0 @@
-{{.get_recipient}} will receive {{.get_amount}} from {{.get_sender}}
-Please enter your PIN to confirm:
\ No newline at end of file
diff --git a/services/registration/transaction_pin.vis b/services/registration/transaction_pin.vis
deleted file mode 100644
index 0388f0c..0000000
--- a/services/registration/transaction_pin.vis
+++ /dev/null
@@ -1,15 +0,0 @@
-RELOAD get_amount
-MAP get_amount
-RELOAD get_recipient
-MAP get_recipient
-RELOAD get_sender
-MAP get_sender
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP transaction_initiated *
diff --git a/services/registration/transaction_pin_swa b/services/registration/transaction_pin_swa
deleted file mode 100644
index 1924166..0000000
--- a/services/registration/transaction_pin_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-{{.get_recipient}} atapokea {{.get_amount}} kutoka kwa {{.get_sender}}
-Tafadhali weka PIN yako kudhibitisha:
\ No newline at end of file
diff --git a/services/registration/transactions b/services/registration/transactions
deleted file mode 100644
index 8152c42..0000000
--- a/services/registration/transactions
+++ /dev/null
@@ -1 +0,0 @@
-{{.get_transactions}}
\ No newline at end of file
diff --git a/services/registration/transactions.vis b/services/registration/transactions.vis
deleted file mode 100644
index b21f1dc..0000000
--- a/services/registration/transactions.vis
+++ /dev/null
@@ -1,15 +0,0 @@
-LOAD get_transactions 0
-MAP get_transactions
-MOUT back 0
-MOUT quit 99
-MNEXT next 11
-MPREV prev 22
-HALT
-LOAD view_statement 0
-RELOAD view_statement
-CATCH . flag_incorrect_statement 1
-INCMP ^ 0
-INCMP quit 99
-INCMP > 11
-INCMP < 22
-INCMP view_statement *
diff --git a/services/registration/transactions_swa b/services/registration/transactions_swa
deleted file mode 100644
index 8152c42..0000000
--- a/services/registration/transactions_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.get_transactions}}
\ No newline at end of file
diff --git a/services/registration/unregistered_number b/services/registration/unregistered_number
deleted file mode 100644
index 9cc33d7..0000000
--- a/services/registration/unregistered_number
+++ /dev/null
@@ -1 +0,0 @@
-The number you have entered is either not registered with Sarafu or is invalid.
\ No newline at end of file
diff --git a/services/registration/unregistered_number.vis b/services/registration/unregistered_number.vis
deleted file mode 100644
index 0ff96be..0000000
--- a/services/registration/unregistered_number.vis
+++ /dev/null
@@ -1,7 +0,0 @@
-LOAD reset_unregistered_number 0
-RELOAD reset_unregistered_number
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/unregistered_number_swa b/services/registration/unregistered_number_swa
deleted file mode 100644
index 19810cb..0000000
--- a/services/registration/unregistered_number_swa
+++ /dev/null
@@ -1 +0,0 @@
-Nambari uliyoingiza haijasajiliwa na Sarafu au sio sahihi.
\ No newline at end of file
diff --git a/services/registration/unspecified_menu b/services/registration/unspecified_menu
deleted file mode 100644
index 4cd1a5c..0000000
--- a/services/registration/unspecified_menu
+++ /dev/null
@@ -1 +0,0 @@
-Unspecified
\ No newline at end of file
diff --git a/services/registration/unspecified_menu_swa b/services/registration/unspecified_menu_swa
deleted file mode 100644
index 009301f..0000000
--- a/services/registration/unspecified_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Haijabainishwa
\ No newline at end of file
diff --git a/services/registration/update_age b/services/registration/update_age
deleted file mode 100644
index 76ca306..0000000
--- a/services/registration/update_age
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_yob
-CATCH profile_update_success flag_allow_update 1
\ No newline at end of file
diff --git a/services/registration/update_familyname.vis b/services/registration/update_familyname.vis
deleted file mode 100644
index 7cd4d9f..0000000
--- a/services/registration/update_familyname.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_familyname
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/update_firstname.vis b/services/registration/update_firstname.vis
deleted file mode 100644
index dca7036..0000000
--- a/services/registration/update_firstname.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_firstname
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/update_gender.vis b/services/registration/update_gender.vis
deleted file mode 100644
index 506a56a..0000000
--- a/services/registration/update_gender.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_gender
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/update_location.vis b/services/registration/update_location.vis
deleted file mode 100644
index 16c4ea2..0000000
--- a/services/registration/update_location.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_location
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/update_offerings.vis b/services/registration/update_offerings.vis
deleted file mode 100644
index 4aeed74..0000000
--- a/services/registration/update_offerings.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_offerings
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/update_profile_items.vis b/services/registration/update_profile_items.vis
deleted file mode 100644
index beda013..0000000
--- a/services/registration/update_profile_items.vis
+++ /dev/null
@@ -1,3 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-MOVE pin_entry
diff --git a/services/registration/update_success b/services/registration/update_success
deleted file mode 100644
index d8d5706..0000000
--- a/services/registration/update_success
+++ /dev/null
@@ -1 +0,0 @@
-Profile updated successfully
\ No newline at end of file
diff --git a/services/registration/update_success.vis b/services/registration/update_success.vis
deleted file mode 100644
index 832ef22..0000000
--- a/services/registration/update_success.vis
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/update_success_swa b/services/registration/update_success_swa
deleted file mode 100644
index 834ba86..0000000
--- a/services/registration/update_success_swa
+++ /dev/null
@@ -1 +0,0 @@
-Akaunti imeupdatiwa
\ No newline at end of file
diff --git a/services/registration/update_yob.vis b/services/registration/update_yob.vis
deleted file mode 100644
index a9388ae..0000000
--- a/services/registration/update_yob.vis
+++ /dev/null
@@ -1,2 +0,0 @@
-RELOAD save_yob
-CATCH profile_update_success flag_allow_update 1
diff --git a/services/registration/view_menu b/services/registration/view_menu
deleted file mode 100644
index 03add31..0000000
--- a/services/registration/view_menu
+++ /dev/null
@@ -1 +0,0 @@
-View profile
\ No newline at end of file
diff --git a/services/registration/view_menu_swa b/services/registration/view_menu_swa
deleted file mode 100644
index bd84b19..0000000
--- a/services/registration/view_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Angalia Wasifu
\ No newline at end of file
diff --git a/services/registration/view_profile b/services/registration/view_profile
deleted file mode 100644
index 5f59496..0000000
--- a/services/registration/view_profile
+++ /dev/null
@@ -1,2 +0,0 @@
-My profile:
-{{.get_profile_info}}
\ No newline at end of file
diff --git a/services/registration/view_profile.vis b/services/registration/view_profile.vis
deleted file mode 100644
index 4f4947c..0000000
--- a/services/registration/view_profile.vis
+++ /dev/null
@@ -1,11 +0,0 @@
-LOAD get_profile_info 0
-MAP get_profile_info 
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH pin_entry flag_account_authorized 0
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP _ 0
-INCMP quit 9
-INCMP . *
diff --git a/services/registration/view_profile_swa b/services/registration/view_profile_swa
deleted file mode 100644
index 1362ebe..0000000
--- a/services/registration/view_profile_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Wasifu wangu:
-{{.get_profile_info}}
\ No newline at end of file
diff --git a/services/registration/view_statement b/services/registration/view_statement
deleted file mode 100644
index 1285cf9..0000000
--- a/services/registration/view_statement
+++ /dev/null
@@ -1 +0,0 @@
-{{.view_statement}}
\ No newline at end of file
diff --git a/services/registration/view_statement.vis b/services/registration/view_statement.vis
deleted file mode 100644
index 4dde523..0000000
--- a/services/registration/view_statement.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-MAP view_statement
-MOUT back 0
-MOUT quit 9
-MNEXT next 11
-MPREV prev 22
-HALT
-INCMP _ 0
-INCMP quit 9
-INCMP > 11
-INCMP < 22
diff --git a/services/registration/view_swa b/services/registration/view_swa
deleted file mode 100644
index bd84b19..0000000
--- a/services/registration/view_swa
+++ /dev/null
@@ -1 +0,0 @@
-Angalia Wasifu
\ No newline at end of file
diff --git a/services/registration/view_voucher b/services/registration/view_voucher
deleted file mode 100644
index 3940982..0000000
--- a/services/registration/view_voucher
+++ /dev/null
@@ -1,2 +0,0 @@
-Enter PIN to confirm selection:
-{{.view_voucher}}
\ No newline at end of file
diff --git a/services/registration/view_voucher.vis b/services/registration/view_voucher.vis
deleted file mode 100644
index 1480099..0000000
--- a/services/registration/view_voucher.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-MAP view_voucher
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP voucher_set *
diff --git a/services/registration/view_voucher_swa b/services/registration/view_voucher_swa
deleted file mode 100644
index 485e2ef..0000000
--- a/services/registration/view_voucher_swa
+++ /dev/null
@@ -1,2 +0,0 @@
-Weka PIN ili kuthibitisha chaguo:
-{{.view_voucher}}
\ No newline at end of file
diff --git a/services/registration/voucher_details b/services/registration/voucher_details
deleted file mode 100644
index d437681..0000000
--- a/services/registration/voucher_details
+++ /dev/null
@@ -1 +0,0 @@
-{{.get_voucher_details}}
\ No newline at end of file
diff --git a/services/registration/voucher_details.vis b/services/registration/voucher_details.vis
deleted file mode 100644
index 1b009f1..0000000
--- a/services/registration/voucher_details.vis
+++ /dev/null
@@ -1,6 +0,0 @@
-CATCH no_voucher flag_no_active_voucher 1
-LOAD get_voucher_details 0
-MAP get_voucher_details
-MOUT back 0
-HALT
-INCMP _ 0
diff --git a/services/registration/voucher_details_menu b/services/registration/voucher_details_menu
deleted file mode 100644
index a588f23..0000000
--- a/services/registration/voucher_details_menu
+++ /dev/null
@@ -1 +0,0 @@
-Voucher details
\ No newline at end of file
diff --git a/services/registration/voucher_details_menu_swa b/services/registration/voucher_details_menu_swa
deleted file mode 100644
index e84661b..0000000
--- a/services/registration/voucher_details_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Maelezo ya Sarafu
\ No newline at end of file
diff --git a/services/registration/voucher_details_swa b/services/registration/voucher_details_swa
deleted file mode 100644
index d437681..0000000
--- a/services/registration/voucher_details_swa
+++ /dev/null
@@ -1 +0,0 @@
-{{.get_voucher_details}}
\ No newline at end of file
diff --git a/services/registration/voucher_set b/services/registration/voucher_set
deleted file mode 100644
index e90d2e5..0000000
--- a/services/registration/voucher_set
+++ /dev/null
@@ -1 +0,0 @@
-Success! {{.set_voucher}} is now your active voucher.
\ No newline at end of file
diff --git a/services/registration/voucher_set.vis b/services/registration/voucher_set.vis
deleted file mode 100644
index e75c693..0000000
--- a/services/registration/voucher_set.vis
+++ /dev/null
@@ -1,10 +0,0 @@
-LOAD reset_incorrect 6
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
-LOAD set_voucher 12
-MAP set_voucher
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
diff --git a/services/registration/voucher_set_swa b/services/registration/voucher_set_swa
deleted file mode 100644
index 97d3fde..0000000
--- a/services/registration/voucher_set_swa
+++ /dev/null
@@ -1 +0,0 @@
-Hongera! {{.set_voucher}} ni Sarafu inayotumika sasa.
\ No newline at end of file
diff --git a/services/registration/vouchers_menu b/services/registration/vouchers_menu
deleted file mode 100644
index 5084c32..0000000
--- a/services/registration/vouchers_menu
+++ /dev/null
@@ -1 +0,0 @@
-My Vouchers
\ No newline at end of file
diff --git a/services/registration/vouchers_menu_swa b/services/registration/vouchers_menu_swa
deleted file mode 100644
index 64ba54e..0000000
--- a/services/registration/vouchers_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Sarafu yangu
\ No newline at end of file
diff --git a/services/registration/yes_menu b/services/registration/yes_menu
deleted file mode 100644
index 3fdfb3d..0000000
--- a/services/registration/yes_menu
+++ /dev/null
@@ -1 +0,0 @@
-Yes
\ No newline at end of file
diff --git a/services/registration/yes_menu_swa b/services/registration/yes_menu_swa
deleted file mode 100644
index 542d3c3..0000000
--- a/services/registration/yes_menu_swa
+++ /dev/null
@@ -1 +0,0 @@
-Ndio
\ No newline at end of file