Completed admin service cleanup