Simplify check during admin removal for whether to cleanup SELinux

Also re-arrange and cleanup

Change-Id: I3fd84b864b75875e6a78874a0fd0756bae78806d