consolidation and cleanup to combine all admin functions into one class