Cleaup of some admin code/features