updated to remove the admin static reference