Completed admin service cleanup
Completed admin service cleanup