Major cleanup for admin utility.