diff --git a/SampleApplications/Samples/GDS/App.config b/SampleApplications/Samples/GDS/App.config
index 1b397f1b74..4fbd7a2c74 100644
--- a/SampleApplications/Samples/GDS/App.config
+++ b/SampleApplications/Samples/GDS/App.config
@@ -3,8 +3,8 @@
   <configSections>
     <section name="Opc.Ua.ServerConfiguration" type="Opc.Ua.ApplicationConfigurationSection,Opc.Ua.Core" />
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  </configSections>
+    
+  <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
   <connectionStrings>
     <add name="gdsdbEntities" connectionString="metadata=res://*/gdsdb.csdl|res://*/gdsdb.ssdl|res://*/gdsdb.msl;provider=System.Data.SqlClient;provider connection string=&quot;Server=(localdb)\v11.0;MultipleActiveResultSets=true;Integrated Security=true;AttachDbFileName=|DataDirectory|\gdsdb.mdf;&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
diff --git a/SampleApplications/Samples/GDS/AuthorizationService.cs b/SampleApplications/Samples/GDS/AuthorizationService.cs
deleted file mode 100644
index 138c3e9601..0000000000
--- a/SampleApplications/Samples/GDS/AuthorizationService.cs
+++ /dev/null
@@ -1,449 +0,0 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Owin.Hosting;
-using Owin;
-using IdentityServer3.Core.Configuration;
-using IdentityServer3.Core.Models;
-using IdentityServer3.Core.Services;
-using IdentityServer3.Core.Validation;
-using IdentityServer3.Core.Services.Default;
-using System.Security.Cryptography.X509Certificates;
-using Opc.Ua.Configuration;
-using Serilog;
-using System.Security.Claims;
-using Microsoft.Owin;
-using System.IO;
-using IdentityServer3.Core.Services.InMemory;
-using System.IdentityModel.Tokens.Jwt;
-
-namespace Opc.Ua.AuthorizationService
-{
-    public class AuthorizationService
-    {
-        private IDisposable m_host;
-        private ApplicationInstance m_application;
-
-        public async void Start(ApplicationInstance application)
-        {
-            Startup.ServiceCertificate = await application.ApplicationConfiguration.SecurityConfiguration.ApplicationCertificate.Find();
-
-            string hostname = System.Net.Dns.GetHostName();
-
-            foreach (var baseAddress in application.ApplicationConfiguration.ServerConfiguration.BaseAddresses)
-            {
-                Uri url = new Uri(baseAddress);
-
-                if (url.Scheme == "https" && url.DnsSafeHost != "localhost")
-                {
-                    hostname = url.DnsSafeHost;
-                    break;
-                }
-            }
-
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
-                .CreateLogger();
-
-            m_host = WebApp.Start<Startup>(String.Format("https://{0}:54333", hostname));
-            m_application = application;
-        }
-    }
-
-    public class Startup
-    {
-        public static X509Certificate2 ServiceCertificate;
-
-        public void Configuration(IAppBuilder app)
-        {
-            var factory = new IdentityServerServiceFactory().UseInMemoryScopes(Scopes.Get()).UseInMemoryUsers(Users.Get());
-
-            factory.TokenService = new Registration<ITokenService>(typeof(CustomTokenService));
-            factory.CorsPolicyService = new Registration<ICorsPolicyService>(new DefaultCorsPolicyService { AllowAll = true });
-            factory.SecretParsers = new Registration<ISecretParser>[] { new Registration<ISecretParser>(new ApplicationCertificateSecretParser()) };
-            factory.SecretValidators = new Registration<ISecretValidator>[] { new Registration<ISecretValidator>(new ApplicationCertificateSecretValidator()) };
-            factory.ClientStore = new Registration<IClientStore>(new ApplicationClientStore());
-            factory.CustomGrantValidators.Add(new Registration<ICustomGrantValidator>(typeof(CustomGrantValidator)));
-
-            var options = new IdentityServerOptions
-            {
-                SiteName = "GDS AuthorizationService",
-
-                SigningCertificate = LoadCertificate(),
-                Factory = factory,
-                InputLengthRestrictions = new InputLengthRestrictions() { Password = 2048 },
-
-                EventsOptions = new EventsOptions
-                {
-                    RaiseSuccessEvents = true,
-                    RaiseErrorEvents = true,
-                    RaiseFailureEvents = true,
-                    RaiseInformationEvents = true
-                },
-            };
-
-            app.UseIdentityServer(options);
-        }
-
-        X509Certificate2 LoadCertificate()
-        {
-            return Startup.ServiceCertificate;
-        }
-    }
-
-    static class Users
-    {
-        public static List<InMemoryUser> Get()
-        {
-            return new List<InMemoryUser>();
-        }
-    }
-
-    static class Scopes
-    {
-        public static List<Scope> Get()
-        {
-            return new List<Scope>
-            {
-                new Scope { Name = "gdsadmin" },
-                new Scope { Name = "appadmin" },
-                new Scope { Name = "pubsub" },
-                new Scope { Name = "pubsub:secret" },
-                new Scope { Name = "observer" }
-            };
-        }
-    }
-
-    public class ApplicationClientStore : IClientStore
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CachingClientStore"/> class.
-        /// </summary>
-        /// <param name="inner">The inner <see cref="IClientStore"/>.</param>
-        /// <param name="cache">The cache.</param>
-        /// <exception cref="System.ArgumentNullException">
-        /// inner
-        /// or
-        /// cache
-        /// </exception>
-        public ApplicationClientStore()
-        {
-        }
-
-        /// <summary>
-        /// Finds a client by id
-        /// </summary>
-        /// <param name="clientId">The client id</param>
-        /// <returns>
-        /// The client
-        /// </returns>
-        public Task<IdentityServer3.Core.Models.Client> FindClientByIdAsync(string clientId)
-        {
-            if (clientId == "urn:localhost:OAuth2TestClient")
-            {
-                return Task.FromResult(new IdentityServer3.Core.Models.Client
-                {
-                    ClientName = "OAuth2TestClient",
-                    ClientId = clientId,
-                    Enabled = true,
-                    AccessTokenType = AccessTokenType.Jwt,
-                    Flow = Flows.ClientCredentials,
-                    ClientSecrets = new List<Secret> { new Secret("secret".Sha256()) },
-                    AllowClientCredentialsOnly = true,
-                    AllowAccessToAllScopes = true
-                });
-            }
-
-            // TBD - look up ApplicationUri in DB.
-
-            return Task.FromResult(new IdentityServer3.Core.Models.Client
-            {
-                ClientName = "Global Discovery Client",
-                ClientId = clientId,
-                Enabled = true,
-                AccessTokenType = AccessTokenType.Jwt,
-                Flow = Flows.Custom,
-                ClientSecrets = new List<Secret>(),
-                AllowAccessToAllCustomGrantTypes = true,
-                AllowedCustomGrantTypes = new List<string> { "urn:opcfoundation.org:oauth2:site_token" },
-                AllowAccessToAllScopes = true
-            });
-        }
-    }
-
-    /// <summary>
-    /// Parses the environment for an X509 client certificate
-    /// </summary>
-    public class ApplicationCertificateSecretParser : ISecretParser
-    {
-        /// <summary>
-        /// Tries to find a secret on the environment that can be used for authentication
-        /// </summary>
-        /// <param name="environment">The environment.</param>
-        /// <returns>
-        /// A parsed secret
-        /// </returns>
-        public async Task<ParsedSecret> ParseAsync(IDictionary<string, object> environment)
-        {
-            var context = new OwinContext(environment);
-
-            if (!context.Request.Body.CanSeek)
-            {
-                var copy = new MemoryStream();
-                await context.Request.Body.CopyToAsync(copy);
-                copy.Seek(0L, SeekOrigin.Begin);
-                context.Request.Body = copy;
-            }
-
-            context.Request.Body.Seek(0L, SeekOrigin.Begin);
-            var body = await context.Request.ReadFormAsync();
-            context.Request.Body.Seek(0L, SeekOrigin.Begin);
-
-            var grantType = body.Get("grant_type");
-
-            if (String.IsNullOrEmpty(grantType))
-            {
-                return null;
-            }
-
-            var clientId = body.Get("client_id");
-
-            if (String.IsNullOrEmpty(clientId))
-            {
-                return null;
-            }
-
-            var clientSecret = body.Get("client_secret");
-
-            if (String.IsNullOrEmpty(clientSecret))
-            {
-                return null;
-            }
-
-            if (grantType == "client_credentials")
-            {
-                return new ParsedSecret
-                {
-                    Id = clientId,
-                    Credential = clientSecret.Sha256(),
-                    Type = "SharedSecret"
-                };
-            }
-
-            var certificate = Convert.FromBase64String(clientId);
-
-            var signature = Convert.FromBase64String(clientSecret);
-
-            var data = body.Get("access_token");
-
-            if (String.IsNullOrEmpty(data))
-            {
-                return null;
-            }
-
-            var accessToken = data;
-
-            data = body.Get("nonce");
-
-            if (String.IsNullOrEmpty(data))
-            {
-                return null;
-            }
-
-            var nonce = Convert.FromBase64String(data);
-
-            try
-            {
-                X509Certificate2 x509 = new X509Certificate2(certificate);
-                // TBD - use a CertificateValidator to verify certificate.
-
-                // check that the id matches the certificate.
-                var applicationUri = Utils.GetApplicationUriFromCertificate(x509);
-
-                // verify signature.
-                var dataToVerify = Utils.Append(new UTF8Encoding(false).GetBytes(accessToken), nonce);
-
-                if (!RsaUtils.RsaPkcs15Sha1_Verify(new ArraySegment<byte>(dataToVerify), signature, x509))
-                {
-                    return null;
-                }
-
-                return new ParsedSecret
-                {
-                    Id = applicationUri,
-                    Credential = x509,
-                    Type = "ApplicationSignature"
-                };
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Validates a secret based on the thumbprint of an X509 Certificate
-    /// </summary>
-    public class ApplicationCertificateSecretValidator : ISecretValidator
-    {
-        /// <summary>
-        /// Validates a secret
-        /// </summary>
-        /// <param name="secrets">The stored secrets.</param>
-        /// <param name="parsedSecret">The received secret.</param>
-        /// <returns>
-        /// A validation result
-        /// </returns>
-        /// <exception cref="System.ArgumentException">ParsedSecret.Credential is not an X509 Certificate</exception>
-        public Task<SecretValidationResult> ValidateAsync(IEnumerable<Secret> secrets, ParsedSecret parsedSecret)
-        {
-            var fail = Task.FromResult(new SecretValidationResult { Success = false });
-            var success = Task.FromResult(new SecretValidationResult { Success = true });
-
-            if (parsedSecret.Type == "SharedSecret")
-            {
-                foreach (var secret in secrets)
-                {
-                    if (secret.Value.Equals(parsedSecret.Credential))
-                    {
-                        return success;
-                    }
-                }
-
-                return fail;
-            }
-
-            if (parsedSecret.Type != "ApplicationSignature")
-            {
-                return fail;
-            }
-
-            var certificate = parsedSecret.Credential as X509Certificate2;
-
-            if (certificate == null)
-            {
-                throw new ArgumentException("ParsedSecret.Credential is not an X509 Certificate");
-            }
-
-            return success;
-        }
-    }
-
-    class CustomGrantValidator : ICustomGrantValidator
-    {
-        public Task<CustomGrantValidationResult> ValidateAsync(ValidatedTokenRequest request)
-        {
-            var accessToken = request.Raw.Get("access_token");
-            var identity = JwtUtils.ValidateToken(new Uri("https://login.microsoftonline.com/opcfoundationprototyping.onmicrosoft.com"), "https://localhost:62540/prototypeserver", accessToken);
-            IssuedIdentityToken token = identity.GetIdentityToken() as IssuedIdentityToken;
-            JwtSecurityToken azureToken = new JwtSecurityToken(new UTF8Encoding(false).GetChars(token.DecryptedTokenData).ToString());
-
-                var scope = request.Raw.Get("scope");
-            var nonce = request.Raw.Get("nonce");
-
-            DateTime now = DateTime.UtcNow;
-            double maxClockSkewInMinutes = 10;
-
-            if (azureToken.ValidFrom.AddMinutes(-maxClockSkewInMinutes) > now || azureToken.ValidTo.AddMinutes(maxClockSkewInMinutes) < now)
-            {
-                return Task.FromResult(new CustomGrantValidationResult(
-                    "Access token provided with the request has expired (" + 
-                    azureToken.ValidTo.ToLocalTime().ToString("yyy-MM-dd HH:mm:ss") + 
-                    ") or is not yet valid (" + 
-                    azureToken.ValidFrom.ToLocalTime().ToString("yyy-MM-dd HH:mm:ss") + ")."));
-            }
-            
-            List<Claim> claims = new List<Claim>();
-            string subject = request.Client.ClientId;
-
-            foreach (var claim in azureToken.Claims)
-            {
-                switch (claim.Type)
-                {
-                    case "unique_name": { subject = claim.Value; claims.Add(claim); break; }
-                    case "name": { claims.Add(claim); break; }
-                }
-            }
-
-            claims.Add(new Claim("nonce", nonce));
-
-            request.Client.AccessTokenLifetime = (int)(azureToken.ValidTo - now).TotalSeconds;
-
-            var result = new CustomGrantValidationResult(
-                subject,
-                "site_token",
-                claims,
-                "gds");
-
-            return Task.FromResult(result);
-        }
-
-        public string GrantType
-        {
-            get { return "urn:opcfoundation.org:oauth2:site_token"; }
-        }
-    }
-
-    class CustomTokenService : DefaultTokenService
-    {
-        public CustomTokenService(IdentityServerOptions options, IClaimsProvider claimsProvider, ITokenHandleStore tokenHandles, ITokenSigningService signingService, IEventService events) 
-            : base(options, claimsProvider, tokenHandles, signingService, events)
-        {
-        }
-
-        public async override Task<Token> CreateAccessTokenAsync(TokenCreationRequest request)
-        {
-            var token = await base.CreateAccessTokenAsync(request);
-
-            token.Lifetime = token.Client.AccessTokenLifetime;
-
-            /*
-            var claims = new List<Claim>();
-            claims.AddRange(await _claimsProvider.GetAccessTokenClaimsAsync(
-                request.Subject,
-                request.Client,
-                request.Scopes,
-                request.ValidatedRequest));
-
-            if (request.Client.IncludeJwtId)
-            {
-                claims.Add(new Claim(Constants.ClaimTypes.JwtId, CryptoRandom.CreateUniqueId()));
-            }
-
-            if (request.ProofKey.IsPresent())
-            {
-                claims.Add(new Claim(Constants.ClaimTypes.Confirmation, request.ProofKey, Constants.ClaimValueTypes.Json));
-            }
-
-            var token = new Token(Constants.TokenTypes.AccessToken)
-            {
-                Audience = string.Format(Constants.AccessTokenAudience, IssuerUri.EnsureTrailingSlash()),
-                Issuer = IssuerUri,
-                Lifetime = request.Client.AccessTokenLifetime,
-                Claims = claims.Distinct(new ClaimComparer()).ToList(),
-                Client = request.Client
-            };
-            */
-
-            var resource = request.ValidatedRequest.Raw["resource"];
-
-            if (String.IsNullOrEmpty(resource))
-            {
-                token.Audience = Namespaces.OAuth2SiteResourceUri;
-            }
-            else
-            {
-                token.Audience = resource;
-            }
-
-            UriBuilder uri = new UriBuilder(token.Issuer);
-            uri.Host = uri.Host.ToLowerInvariant();
-            token.Issuer = uri.ToString();
-            
-            return token;
-        }
-    }
-}
diff --git a/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj b/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj
index 01ebb4f41a..5c46175126 100644
--- a/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj
+++ b/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj
@@ -68,34 +68,6 @@
       <HintPath>..\..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="IdentityServer3, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\IdentityServer3.2.5.1\lib\net45\IdentityServer3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=1.0.0.127, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Logging.1.0.0\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.0.0.127, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Tokens.5.0.0\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Owin.Host.HttpListener.3.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Owin.Hosting.3.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Opc.Ua.Configuration, Version=1.2.334.6, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll</HintPath>
@@ -108,18 +80,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll</HintPath>
     </Reference>
-    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Serilog.2.1.0\lib\net45\Serilog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Serilog.Sinks.Literate, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Serilog.Sinks.Literate.2.0.0\lib\net45\Serilog.Sinks.Literate.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -133,38 +93,24 @@
     <Reference Include="System.IdentityModel">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.0.0.127, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.0.0\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Runtime.Serialization">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.ServiceModel">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApplicationsDatabase.cs" />
-    <Compile Include="AuthorizationService.cs" />
     <Compile Include="RoleBasedIdentity.cs" />
     <Compile Include="GlobalDiscoveryServerConfiguration.cs" />
     <Compile Include="ApplicationsNodeManager.cs" />
     <Compile Include="GlobalDiscoveryServerServer.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SelfHost.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
diff --git a/SampleApplications/Samples/GDS/GlobalDiscoveryServerServer.cs b/SampleApplications/Samples/GDS/GlobalDiscoveryServerServer.cs
index 00c01ab8a0..c1328dd017 100644
Binary files a/SampleApplications/Samples/GDS/GlobalDiscoveryServerServer.cs and b/SampleApplications/Samples/GDS/GlobalDiscoveryServerServer.cs differ
diff --git a/SampleApplications/Samples/GDS/Program.cs b/SampleApplications/Samples/GDS/Program.cs
index 877fcaee0b..4d60479e0d 100644
--- a/SampleApplications/Samples/GDS/Program.cs
+++ b/SampleApplications/Samples/GDS/Program.cs
@@ -62,13 +62,6 @@ namespace Opc.Ua.GdsServer
                 Task<bool> task2 = application.CheckApplicationInstanceCertificate(false, 0);
                 task2.Wait();
 
-                // add handler.
-                application.ApplicationConfiguration.CertificateValidator.CertificateValidation += CertificateValidator_CertificateValidation;
-
-                // start authorization service.
-                var aus = new Opc.Ua.AuthorizationService.AuthorizationService();
-                aus.Start(application);
-
                 // start the server.
                 var server = new GlobalDiscoveryServerServer();
                 Task task3 = application.Start(server);
@@ -83,14 +76,5 @@ namespace Opc.Ua.GdsServer
                 return;
             }
         }
-
-        static void CertificateValidator_CertificateValidation(CertificateValidator sender, CertificateValidationEventArgs e)
-        {
-            // automatically accept all untrusted certficates.
-            if (e.Error.Code == StatusCodes.BadCertificateUntrusted)
-            {
-                e.Accept = true;
-            }
-        }
     }
 }
diff --git a/SampleApplications/Samples/GDS/SelfHost.cs b/SampleApplications/Samples/GDS/SelfHost.cs
deleted file mode 100644
index 092142fa36..0000000000
--- a/SampleApplications/Samples/GDS/SelfHost.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Web.Http;
-
-namespace Opc.Ua.GdsServer
-{
-    public class ProductsController : ApiController
-    {
-        Product[] products = new Product[]
-        {
-            new Product { Id = 1, Name = "Tomato Soup", Category = "Groceries", Price = 1 },
-            new Product { Id = 2, Name = "Yo-yo", Category = "Toys", Price = 3.75M },
-            new Product { Id = 3, Name = "Hammer", Category = "Hardware", Price = 16.99M }
-        };
-
-        public IEnumerable<Product> GetAllProducts()
-        {
-            return products;
-        }
-
-        public Product GetProductById(int id)
-        {
-            var product = products.FirstOrDefault((p) => p.Id == id);
-            if (product == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-            return product;
-        }
-
-        public IEnumerable<Product> GetProductsByCategory(string category)
-        {
-            return products.Where(p => string.Equals(p.Category, category,
-                    StringComparison.OrdinalIgnoreCase));
-        }
-    }
-
-    public class Product
-    {
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Category { get; set; }
-        public decimal Price { get; set; }
-    }
-}
diff --git a/SampleApplications/Samples/GDS/packages.config b/SampleApplications/Samples/GDS/packages.config
index 049bfbdf44..c089e85e2e 100644
--- a/SampleApplications/Samples/GDS/packages.config
+++ b/SampleApplications/Samples/GDS/packages.config
@@ -1,17 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
-  <package id="IdentityServer3" version="2.5.1" targetFramework="net46" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
-  <package id="Microsoft.IdentityModel.Logging" version="1.0.0" targetFramework="net46" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.0.0" targetFramework="net46" />
-  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net46" />
-  <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="Owin" version="1.0" targetFramework="net46" />
-  <package id="Serilog" version="2.1.0" targetFramework="net46" />
-  <package id="Serilog.Sinks.Literate" version="2.0.0" targetFramework="net46" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.0.0" targetFramework="net46" />
 </packages>
\ No newline at end of file