diff --git a/modules/scripts/change-ip.sh b/modules/scripts/change-ip.sh
index 144549e5..8c5c9ba9 100644
--- a/modules/scripts/change-ip.sh
+++ b/modules/scripts/change-ip.sh
@@ -5,7 +5,6 @@ echo "----------------------------------------"
 echo "Entgra IoT Server IP configuration tool"
 echo "----------------------------------------"
 
-
 ##################################### IP configs related to core ####################################
 
 echo ""
@@ -29,7 +28,6 @@ while [[ -z $val2 ]]; do #if $val2 is a zero length String
     read val2;
 done
 
-
 echo "--------------------------------------"
 echo "All your " + $val1 + " IP's are replaced with " +$val2 ;
 echo "--------------------------------------"
@@ -41,11 +39,6 @@ sed -i '' -e 's#\(<HostName>\)'$val1'\(</HostName>\)#\1'$val2'\2#g' ../conf/carb
 sed -i '' -e 's#\(<MgtHostName>\)'$val1'\(</MgtHostName>\)#\1'$val2'\2#g' ../conf/carbon.xml
 echo "Completed!!"
 
-#--------------------
-echo "Changing <IoT_HOME>/conf/app-manager.xml"
-sed -i '' -e 's#\(<IdentityProviderUrl>\)https\:\/\/'$val1'\:\${mgt\.transport\.https\.port}\/samlsso\(</IdentityProviderUrl>\)#\1'https://$val2:9443/samlsso'\2#g' ../conf/app-manager.xml
-echo "Completed!!"
-
 #--------------------
 echo "Changing <IoT_HOME>/conf/identity/sso-idp-config.xml"
 sed -i '' -e 's/'$val1'/'$val2'/g' ../conf/identity/sso-idp-config.xml
@@ -190,9 +183,6 @@ sed -i '' -e 's#\(<HostName>\)'$val1'\(</HostName>\)#\1'$val2'\2#g' ../wso2/brok
 sed -i '' -e 's#\(<MgtHostName>\)'$val1'\(</MgtHostName>\)#\1'$val2'\2#g' ../wso2/broker/conf/carbon.xml
 echo "Completed!!"
 
-
-
-
 ##################################### IP configs related to analytics ####################################
 
 echo ""
@@ -200,8 +190,6 @@ echo ""
 echo ">>> Step 3: Change current IP address of the IoT Analytics"
 echo "-------------------------------------------------------"
 
-
-
 #--------------------
 echo "Changing  <IoT_HOME>/bin/iot-server.sh"
 sed -i -e 's/-Diot.analytics.host.*/-Diot.analytics.host="'$val2'" \\/' ../bin/iot-server.sh
diff --git a/modules/scripts/change-superadmin-credentials.sh b/modules/scripts/change-superadmin-credentials.sh
index d758370a..4fbcd838 100755
--- a/modules/scripts/change-superadmin-credentials.sh
+++ b/modules/scripts/change-superadmin-credentials.sh
@@ -5,7 +5,6 @@ echo "----------------------------------------"
 echo "Entgra IoT Server Super Admin Credentials Changing tool"
 echo "----------------------------------------"
 
-
 ##################################### Super Admin Credentials Change ####################################
 
 echo ""
@@ -47,23 +46,6 @@ sed -i -e 's#\(<AdminUsername>\)'$val1'\(</AdminUsername>\)#\1'$val3'\2#g' ../co
 sed -i -e 's#\(<AdminPassword>\)'$val2'\(</AdminPassword>\)#\1'$val4'\2#g' ../conf/cdm-config.xml
 echo "Completed!!"
 
-echo "Changing <IoT_HOME>/conf/app-manager.xml"
-sed -i -e 's#\(<Username>\)'$val1'\(</Username>\)#\1'$val3'\2#g' ../conf/app-manager.xml
-sed -i -e 's#\(<Password>\)'$val2'\(</Password>\)#\1'$val4'\2#g' ../conf/app-manager.xml
-
-sed -i -e 's#\(<DASUsername>\)'$val1'\(</DASUsername>\)#\1'$val3'\2#g' ../conf/app-manager.xml
-sed -i -e 's#\(<DASPassword>\)'$val2'\(</DASPassword>\)#\1'$val4'\2#g' ../conf/app-manager.xml
-
-sed -i -e 's#\(<username>\)'$val1'\(</username>\)#\1'$val3'\2#g' ../conf/app-manager.xml
-sed -i -e 's#\(<password>\)'$val2'\(</password>\)#\1'$val4'\2#g' ../conf/app-manager.xml
-
-sed -i -e 's#\(<property name="Username">\)'$val1'\(</property>\)#\1'$val3'\2#g' ../conf/app-manager.xml
-sed -i -e 's#\(<property name="Password">\)'$val2'\(</property>\)#\1'$val4'\2#g' ../conf/app-manager.xml
-
-sed -i -e 's#\(<Property name="AuthUser">\)'$val1'\(</Property>\)#\1'$val3'\2#g' ../conf/app-manager.xml
-sed -i -e 's#\(<Property name="AuthPass">\)'$val2'\(</Property>\)#\1'$val4'\2#g' ../conf/app-manager.xml
-echo "Completed!!"
-
 echo "Changing <IoT_HOME>/conf/iot-api-config.xml"
 sed -i -e 's#\(<Username>\)'$val1'\(</Username>\)#\1'$val3'\2#g' ../conf/iot-api-config.xml
 sed -i -e 's#\(<Password>\)'$val2'\(</Password>\)#\1'$val4'\2#g' ../conf/iot-api-config.xml