Add nag notice for admin accounts; code cleanup