Removed group references and moved to strongly-typed settings.