Got rid of most of the if admin references.

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Resolved Conflicts