Some cleanup of Admin commands.
Signed-off-by: Chris Sanders <zidane@outlook.com>