[WFLY-2142] / [WFLY-490] Simplify service removal for security realms as code was regularly out of synch.