Simplify check during admin removal for whether to cleanup SELinux

Also re-arrange and cleanup

Change-Id: I9806d98cd69037819e40d0e20a64c772e406b6ab