Clean up and remove unused code.
Make sure System users cannot be removed from System group.
Add/remove user and do not display user group.
Do not allow admin to remove himself/herself from system.
Merge pull request #1898 from jburel/admin-fix

Admin fix