diff --git a/APCAppCore/APCAppCore/Library/DataArchiverAndCollector/Trackers/APCCoreLocationTracker.m b/APCAppCore/APCAppCore/Library/DataArchiverAndCollector/Trackers/APCCoreLocationTracker.m
index 21f552b3..12949cdb 100644
--- a/APCAppCore/APCAppCore/Library/DataArchiverAndCollector/Trackers/APCCoreLocationTracker.m
+++ b/APCAppCore/APCAppCore/Library/DataArchiverAndCollector/Trackers/APCCoreLocationTracker.m
@@ -103,6 +103,7 @@ - (instancetype)initWithIdentifier:(NSString*)identifier
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
+    _locationManager.delegate = nil;
 }
 
 - (void)setupInitialLocationParameters
@@ -126,6 +127,7 @@ - (void)startTracking
     if ([CLLocationManager locationServicesEnabled] == YES)
     {
         APCLogDebug(@"Start location tracking");
+        self.locationManager.delegate = nil;
         self.locationManager = [[CLLocationManager alloc] init];
         self.locationManager.delegate = self;
 
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarViewController.m
index 57b936c4..a8ab8272 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarViewController.m
@@ -100,6 +100,12 @@ @interface APCMedicationTrackerCalendarViewController  ( ) <UITableViewDataSourc
 
 @implementation APCMedicationTrackerCalendarViewController
 
+- (void)dealloc {
+    _exScrollibur.delegate = nil;
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Table View Data Source Methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarWeeklyView.m b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarWeeklyView.m
index 6a4c5a05..ea4fbd8d 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarWeeklyView.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerCalendarWeeklyView.m
@@ -104,6 +104,11 @@ - (id)initWithFrame:(CGRect)frame
     return self;
 }
 
+- (void)dealloc {
+    _leftSwiper.delegate = nil;
+    _rightSwiper.delegate = nil;
+}
+
 - (void)setupViews
 {
     {
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerDetailViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerDetailViewController.m
index 5d8cc28c..a60492dc 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerDetailViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingAppComponent/APCMedicationTrackerDetailViewController.m
@@ -76,6 +76,11 @@ @interface APCMedicationTrackerDetailViewController  ( )  <UITableViewDataSource
 
 @implementation APCMedicationTrackerDetailViewController
 
+- (void)dealloc {
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Table View Data Source Methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationDosage/APCMedicationDosageViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationDosage/APCMedicationDosageViewController.m
index a8f7f49c..b59e9191 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationDosage/APCMedicationDosageViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationDosage/APCMedicationDosageViewController.m
@@ -58,6 +58,11 @@ @interface APCMedicationDosageViewController  ( )  <UITableViewDataSource, UITab
 
 @implementation APCMedicationDosageViewController
 
+- (void)dealloc {
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Navigation Bar Button Action Methods
 
 - (void)doneButtonTapped:(UIBarButtonItem *) __unused sender
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationFrequency/APCMedicationFrequencyViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationFrequency/APCMedicationFrequencyViewController.m
index 05479ffc..7f9d4278 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationFrequency/APCMedicationFrequencyViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationFrequency/APCMedicationFrequencyViewController.m
@@ -95,6 +95,11 @@ @interface APCMedicationFrequencyViewController  ( )  <UITableViewDataSource, UI
 
 @implementation APCMedicationFrequencyViewController
 
+- (void)dealloc {
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Table View Data Source Methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationLabel/APCMedicationColorViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationLabel/APCMedicationColorViewController.m
index 687779d6..dafa9d71 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationLabel/APCMedicationColorViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationLabel/APCMedicationColorViewController.m
@@ -65,6 +65,11 @@ @interface APCMedicationColorViewController  ( )  <UITableViewDataSource, UITabl
 
 @implementation APCMedicationColorViewController
 
+- (void)dealloc {
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Navigation Bar Button Action Methods
 
 - (IBAction)doneButtonTapped:(UIBarButtonItem *) __unused sender
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationName/APCMedicationNameViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationName/APCMedicationNameViewController.m
index 29f1a431..46f0fadd 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationName/APCMedicationNameViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationName/APCMedicationNameViewController.m
@@ -67,6 +67,12 @@ @interface APCMedicationNameViewController  ( )  <UITableViewDataSource, UITable
 
 @implementation APCMedicationNameViewController
 
+
+- (void)dealloc {
+    _tabulator.delegate = nil;
+    _tabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Navigation Bar Button Action Methods
 
 - (void)doneButtonTapped:(UIBarButtonItem *) __unused sender
diff --git a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationSetup/APCMedicationTrackerSetupViewController.m b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationSetup/APCMedicationTrackerSetupViewController.m
index 8c688243..e6005d10 100644
--- a/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationSetup/APCMedicationTrackerSetupViewController.m
+++ b/APCAppCore/APCAppCore/Library/MedicationTrackingSetup/MedicationSetup/APCMedicationTrackerSetupViewController.m
@@ -118,6 +118,13 @@ @interface APCMedicationTrackerSetupViewController  ( )  <UITableViewDataSource,
 
 @implementation APCMedicationTrackerSetupViewController
 
+- (void)dealloc {
+    _setupTabulator.delegate = nil;
+    _setupTabulator.dataSource = nil;
+    _listTabulator.delegate = nil;
+    _listTabulator.dataSource = nil;
+}
+
 #pragma  mark  -  Table View Data Source Methods
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *) __unused tableView
diff --git a/APCAppCore/APCAppCore/Library/Parameters/APCParametersCell.m b/APCAppCore/APCAppCore/Library/Parameters/APCParametersCell.m
index f810653f..68daa0ba 100644
--- a/APCAppCore/APCAppCore/Library/Parameters/APCParametersCell.m
+++ b/APCAppCore/APCAppCore/Library/Parameters/APCParametersCell.m
@@ -45,6 +45,10 @@ @interface APCParametersCell ()
 
 @implementation APCParametersCell
 
+- (void)dealloc {
+    _parameterTextInput.delegate = nil;
+}
+
 - (void)awakeFromNib {
     // Initialization code
     [self.parameterTextInput setDelegate:self];
diff --git a/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m b/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m
index d0a2d665..a97eecc3 100644
--- a/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m
+++ b/APCAppCore/APCAppCore/Library/Permissions/APCPermissionsManager.m
@@ -494,6 +494,7 @@ - (void)appDidRegisterForRemoteNotifications: (NSNotification *)notification
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
+    _locationManager.delegate = nil;
 }
 
 @end
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/APCShareViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/APCShareViewController.m
index 233a7aa1..3c50e9e4 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/APCShareViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/APCShareViewController.m
@@ -55,6 +55,11 @@ @interface APCShareViewController () <MFMessageComposeViewControllerDelegate, MF
 
 @implementation APCShareViewController
 
+- (void)dealloc {
+    _tableView.delegate = nil;
+    _tableView.dataSource = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -251,7 +256,7 @@ - (void)mailComposeController:(MFMailComposeViewController *)controller didFinis
         default:
             break;
     }
-    
+    controller.delegate = nil;
     [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
@@ -270,7 +275,7 @@ - (void)messageComposeViewController:(MFMessageComposeViewController *)controlle
         default:
             break;
     }
-    
+    controller.delegate = nil;
     [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyDetailsViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyDetailsViewController.m
index efeb44c5..f5d03434 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyDetailsViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyDetailsViewController.m
@@ -42,6 +42,10 @@ @interface APCStudyDetailsViewController () <UIWebViewDelegate>
 
 @implementation APCStudyDetailsViewController
 
+- (void)dealloc {
+    _webView.delegate = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewCollectionViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewCollectionViewController.m
index 83cc437c..21ffcc60 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewCollectionViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewCollectionViewController.m
@@ -84,6 +84,7 @@ -(void)viewDidAppear:(BOOL)animated {
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:APCConsentCompletedWithDisagreeNotification object:nil];
+    _collectionView.delegate = nil;
 }
 
 - (void) goBackToSignUpJoin: (NSNotification *) __unused notification
@@ -436,7 +437,7 @@ - (void)mailComposeController:(MFMailComposeViewController *)controller didFinis
         default:
             break;
     }
-    
+    controller.mailComposeDelegate = nil;
     [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewViewController.m
index 497ea101..f379dad5 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/APCStudyOverviewViewController.m
@@ -56,7 +56,6 @@ @interface APCStudyOverviewViewController () <ORKTaskViewControllerDelegate>
 
 @implementation APCStudyOverviewViewController
 
-
 #pragma mark - Lifecycle
 
 - (void)viewDidLoad {
@@ -85,6 +84,8 @@ - (void)viewWillAppear:(BOOL)animated
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:APCConsentCompletedWithDisagreeNotification object:nil];
+    _tableView.delegate = nil;
+    _tableView.dataSource = nil;
 }
 
 - (void)goBackToSignUpJoin:(NSNotification *) __unused notification
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/APCWebViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/APCWebViewController.m
index 8ce718c6..68e455ec 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/APCWebViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/APCWebViewController.m
@@ -39,6 +39,10 @@ @interface APCWebViewController ()
 
 @implementation APCWebViewController
 
+- (void)dealloc {
+    _webview.delegate = nil;
+}
+
 -(void)viewDidLoad{
     self.webview.delegate = self;
     self.webview.alpha = 0.0;
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/EmailVerification/APCChangeEmailViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/EmailVerification/APCChangeEmailViewController.m
index 66593a0f..034fe914 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/EmailVerification/APCChangeEmailViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/EmailVerification/APCChangeEmailViewController.m
@@ -48,6 +48,10 @@ @interface APCChangeEmailViewController ()
 
 @implementation APCChangeEmailViewController
 
+- (void)dealloc {
+    _emailTextField.delegate = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m
index bd6872e4..0ecbd028 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCForgotPasswordViewController.m
@@ -45,6 +45,10 @@ @interface APCForgotPasswordViewController ()
 
 @implementation APCForgotPasswordViewController
 
+- (void)dealloc {
+    _emailTextField.delegate = nil;
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCSignInViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCSignInViewController.m
index 458f8de4..44a9a589 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCSignInViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/SignIn/APCSignInViewController.m
@@ -46,6 +46,11 @@ @interface APCSignInViewController () <ORKTaskViewControllerDelegate>
 
 @implementation APCSignInViewController
 
+- (void)dealloc {
+    _userHandleTextField.delegate = nil;
+    _passwordTextField.delegate = nil;
+}
+
 #pragma mark - Life Cycle
 
 - (void)viewDidLoad {
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m
index 5361aa18..1d9f1e2d 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpGeneralInfoViewController.m
@@ -634,10 +634,12 @@ - (void) imagePickerController:(UIImagePickerController *)picker didFinishPickin
     
     [self.profileImageButton setImage:image forState:UIControlStateNormal];
     
+    picker.delegate = nil;
     [picker dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void) imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    picker.delegate = nil;
     [picker dismissViewControllerAnimated:YES completion:nil];
 }
 
diff --git a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpInfoViewController.m b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpInfoViewController.m
index 99795f0f..43c61595 100644
--- a/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpInfoViewController.m
+++ b/APCAppCore/APCAppCore/UI/Onboarding/SignUp/APCSignUpInfoViewController.m
@@ -54,6 +54,11 @@ @implementation APCSignUpInfoViewController
 @synthesize stepProgressBar;
 @synthesize user = _user;
 
+- (void)dealloc {
+    _nameTextField.delegate = nil;
+    _emailTextField.delegate = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m
index 1dae8f83..eb530d5f 100644
--- a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m
+++ b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCProfileViewController.m
@@ -72,6 +72,10 @@ @interface APCProfileViewController () <ORKTaskViewControllerDelegate>
 
 @implementation APCProfileViewController
 
+- (void)dealloc {
+    _nameTextField.delegate = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     NSString *build = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"];
@@ -1166,11 +1170,13 @@ - (void) imagePickerController:(UIImagePickerController *)picker didFinishPickin
     self.profileImage = image;
     [self.profileImageButton setImage:image forState:UIControlStateNormal];
     self.user.profileImage = UIImagePNGRepresentation(image);
+    picker.delegate = nil;
     [picker dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void) imagePickerControllerDidCancel:(UIImagePickerController *)picker
 {
+    picker.delegate = nil;
     [picker dismissViewControllerAnimated:YES completion:nil];
 }
 
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCSharingOptionsViewController.m b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCSharingOptionsViewController.m
index a438db8b..6e966a7c 100644
--- a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCSharingOptionsViewController.m
+++ b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCSharingOptionsViewController.m
@@ -55,6 +55,11 @@ @interface APCSharingOptionsViewController()
 
 @implementation APCSharingOptionsViewController
 
+- (void)dealloc {
+    _tableView.delegate = nil;
+    _tableView.dataSource = nil;
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
diff --git a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCWithdrawSurveyViewController.m b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCWithdrawSurveyViewController.m
index 29c2c25c..b3457a27 100644
--- a/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCWithdrawSurveyViewController.m
+++ b/APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCWithdrawSurveyViewController.m
@@ -48,6 +48,11 @@ @interface APCWithdrawSurveyViewController ()<APCWithdrawDescriptionViewControll
 
 @implementation APCWithdrawSurveyViewController
 
+- (void)dealloc {
+    _tableView.delegate = nil;
+    _tableView.dataSource = nil;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     
diff --git a/APCAppCore/APCAppCore/UI/TableViewCells/APCPickerTableViewCell.m b/APCAppCore/APCAppCore/UI/TableViewCells/APCPickerTableViewCell.m
index 38d17bed..b0369156 100644
--- a/APCAppCore/APCAppCore/UI/TableViewCells/APCPickerTableViewCell.m
+++ b/APCAppCore/APCAppCore/UI/TableViewCells/APCPickerTableViewCell.m
@@ -43,6 +43,11 @@ - (void)awakeFromNib {
     self.pickerView.delegate = self;
 }
 
+- (void)dealloc {
+    _pickerView.delegate = nil;
+    _pickerView.dataSource = nil;
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 
diff --git a/APCAppCore/APCAppCore/UI/TableViewCells/APCTextFieldTableViewCell.m b/APCAppCore/APCAppCore/UI/TableViewCells/APCTextFieldTableViewCell.m
index 1db29752..2ca88a35 100644
--- a/APCAppCore/APCAppCore/UI/TableViewCells/APCTextFieldTableViewCell.m
+++ b/APCAppCore/APCAppCore/UI/TableViewCells/APCTextFieldTableViewCell.m
@@ -63,6 +63,10 @@ - (void)awakeFromNib {
     [self setupAppearance];
 }
 
+- (void)dealloc {
+    _textField.delegate = nil;
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 
diff --git a/APCAppCore/APCAppCore/UI/TasksAndSteps/CommonTaskVCs/InstructionStepViewControllers/APCIntroductionViewController.m b/APCAppCore/APCAppCore/UI/TasksAndSteps/CommonTaskVCs/InstructionStepViewControllers/APCIntroductionViewController.m
index 4d5c520b..8f2a745f 100644
--- a/APCAppCore/APCAppCore/UI/TasksAndSteps/CommonTaskVCs/InstructionStepViewControllers/APCIntroductionViewController.m
+++ b/APCAppCore/APCAppCore/UI/TasksAndSteps/CommonTaskVCs/InstructionStepViewControllers/APCIntroductionViewController.m
@@ -58,6 +58,11 @@ @interface APCIntroductionViewController  ( ) <UIScrollViewDelegate>
 
 @implementation APCIntroductionViewController
 
+- (void)dealloc {
+    _textScroller.delegate = nil;
+    _imageScroller.delegate = nil;
+}
+
 #pragma  mark  -  Initialise Scroll View With Images
 
 - (void)initialiseImageScrollView
diff --git a/APCAppCore/APCAppCore/UI/Views/APCPasscodeView.m b/APCAppCore/APCAppCore/UI/Views/APCPasscodeView.m
index 65e46c89..c1c73b53 100644
--- a/APCAppCore/APCAppCore/UI/Views/APCPasscodeView.m
+++ b/APCAppCore/APCAppCore/UI/Views/APCPasscodeView.m
@@ -60,6 +60,10 @@ - (instancetype) initWithFrame:(CGRect)frame {
     return self;
 }
 
+- (void)dealloc {
+    _hiddenTextField.delegate = nil;
+}
+
 - (void) addControls {
     _digitViews = [NSMutableArray new];