Simplify check during admin removal for whether to cleanup SELinux
Also re-arrange and cleanup

Change-Id: I1261e715d8d04b72f8a29b8a24268d75946d24dc