Removal of non-necessary code
Merge remote-tracking branch 'origin/iOSunit_testing' into iOSunit_testing