Admin commands added
Code cleanup