More admin cleanup

Did a bit more clean up.