Step 1 for removing Guardian
remove guardian app -- step 2
merged rm_guardian branch and resolved conflict