Merge branch 'develop' into user/daspr/kmodsamplefix

27 files changed, 0 insertions, 3083 deletions

diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.cpp b/biometrics/adapters/engine_adapter/EngineAdapter.cpp
deleted file mode 100644
index 22961124..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    EngineAdapter.cpp
-
-Abstract:
-
-    This module contains a stub implementation of an Engine Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Header files...
-//
-///////////////////////////////////////////////////////////////////////////////
-#include "precomp.h"
-#include "winbio_adapter.h"
-#include "EngineAdapter.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Forward declarations for the Engine Adapter's interface routines...
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-EngineAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterEndOperation(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterQueryPreferredFormat(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REGISTERED_FORMAT StandardFormat,
-    _Out_ PWINBIO_UUID VendorFormat
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterQueryIndexVectorSize(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T IndexElementCount
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterQueryHashAlgorithms(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T AlgorithmCount,
-    _Out_ PSIZE_T AlgorithmBufferSize,
-    _Out_ PUCHAR *AlgorithmBuffer
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterSetHashAlgorithm(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ SIZE_T AlgorithmBufferSize,
-    _In_ PUCHAR AlgorithmBuffer
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterAcceptSampleHint(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T SampleHint
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterAcceptSampleData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_BIR SampleBuffer,
-    _In_ SIZE_T SampleSize,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterExportEngineData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_DATA_FLAGS Flags,
-    _Out_ PWINBIO_BIR *SampleBuffer,
-    _Out_ PSIZE_T SampleSize
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterVerifyFeatureSet(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PBOOLEAN Match,
-    _Out_ PUCHAR *PayloadBlob,
-    _Out_ PSIZE_T PayloadBlobSize,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterIdentifyFeatureSet(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_IDENTITY Identity,
-    _Out_ PWINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PUCHAR *PayloadBlob,
-    _Out_ PSIZE_T PayloadBlobSize,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterCreateEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterUpdateEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterGetEnrollmentStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterGetEnrollmentHash(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterCheckForDuplicate(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_IDENTITY Identity,
-    _Out_ PWINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PBOOLEAN Duplicate
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterCommitEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _In_ PUCHAR PayloadBlob,
-    _In_ SIZE_T PayloadBlobSize
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterDiscardEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-
-static HRESULT
-WINAPI
-EngineAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Interface dispatch table
-//
-///////////////////////////////////////////////////////////////////////////////
-static WINBIO_ENGINE_INTERFACE g_EngineInterface = {
-    WINBIO_ENGINE_INTERFACE_VERSION_1,
-    WINBIO_ADAPTER_TYPE_ENGINE,
-    sizeof(WINBIO_ENGINE_INTERFACE),
-    {0xb876fdc8, 0x34e7, 0x471a, {0x82, 0xc8, 0x9c, 0xba, 0x6a, 0x35, 0x38, 0xec}},
-
-    EngineAdapterAttach,
-    EngineAdapterDetach,
-    EngineAdapterClearContext,
-    EngineAdapterQueryPreferredFormat,
-    EngineAdapterQueryIndexVectorSize,
-    EngineAdapterQueryHashAlgorithms,
-    EngineAdapterSetHashAlgorithm,
-    EngineAdapterAcceptSampleHint,
-    EngineAdapterAcceptSampleData,
-    EngineAdapterExportEngineData,
-    EngineAdapterVerifyFeatureSet,
-    EngineAdapterIdentifyFeatureSet,
-    EngineAdapterCreateEnrollment,
-    EngineAdapterUpdateEnrollment,
-    EngineAdapterGetEnrollmentStatus,
-    EngineAdapterGetEnrollmentHash,
-    EngineAdapterCheckForDuplicate,
-    EngineAdapterCommitEnrollment,
-    EngineAdapterDiscardEnrollment,
-    EngineAdapterControlUnit,
-    EngineAdapterControlUnitPrivileged
-};
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Mandatory DLL entrypoint function.
-//
-///////////////////////////////////////////////////////////////////////////////
-BOOL APIENTRY 
-DllMain( 
-    HANDLE ModuleHandle, 
-    DWORD ReasonForCall, 
-    LPVOID Reserved
-    )
-{
-    UNREFERENCED_PARAMETER(ModuleHandle);
-    UNREFERENCED_PARAMETER(ReasonForCall);
-    UNREFERENCED_PARAMETER(Reserved);
-
-    return TRUE;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Well-known interface-discovery function exported by the Engine Adapter
-//
-///////////////////////////////////////////////////////////////////////////////
-HRESULT
-WINAPI
-WbioQueryEngineInterface(
-    _Out_ PWINBIO_ENGINE_INTERFACE *EngineInterface
-    )
-{
-    *EngineInterface = &g_EngineInterface;
-    return S_OK;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Engine Adapter action routines
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-EngineAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterQueryPreferredFormat(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REGISTERED_FORMAT StandardFormat,
-    _Out_ PWINBIO_UUID VendorFormat
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(StandardFormat);
-    UNREFERENCED_PARAMETER(VendorFormat);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterQueryIndexVectorSize(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T IndexElementCount
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(IndexElementCount);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterQueryHashAlgorithms(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T AlgorithmCount,
-    _Out_ PSIZE_T AlgorithmBufferSize,
-    _Out_ PUCHAR *AlgorithmBuffer
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(AlgorithmCount);
-    UNREFERENCED_PARAMETER(AlgorithmBufferSize);
-    UNREFERENCED_PARAMETER(AlgorithmBuffer);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterSetHashAlgorithm(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ SIZE_T AlgorithmBufferSize,
-    _In_ PUCHAR AlgorithmBuffer
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(AlgorithmBufferSize);
-    UNREFERENCED_PARAMETER(AlgorithmBuffer);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterAcceptSampleHint(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T SampleHint
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(SampleHint);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterAcceptSampleData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_BIR SampleBuffer,
-    _In_ SIZE_T SampleSize,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(SampleBuffer);
-    UNREFERENCED_PARAMETER(SampleSize);
-    UNREFERENCED_PARAMETER(Purpose);
-    UNREFERENCED_PARAMETER(RejectDetail);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterExportEngineData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_DATA_FLAGS Flags,
-    _Out_ PWINBIO_BIR *SampleBuffer,
-    _Out_ PSIZE_T SampleSize
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Flags);
-    UNREFERENCED_PARAMETER(SampleBuffer);
-    UNREFERENCED_PARAMETER(SampleSize);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterVerifyFeatureSet(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PBOOLEAN Match,
-    _Out_ PUCHAR *PayloadBlob,
-    _Out_ PSIZE_T PayloadBlobSize,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-    UNREFERENCED_PARAMETER(Match);
-    UNREFERENCED_PARAMETER(PayloadBlob);
-    UNREFERENCED_PARAMETER(PayloadBlobSize);
-    UNREFERENCED_PARAMETER(HashValue);
-    UNREFERENCED_PARAMETER(HashSize);
-    UNREFERENCED_PARAMETER(RejectDetail);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterIdentifyFeatureSet(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_IDENTITY Identity,
-    _Out_ PWINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PUCHAR *PayloadBlob,
-    _Out_ PSIZE_T PayloadBlobSize,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-    UNREFERENCED_PARAMETER(PayloadBlob);
-    UNREFERENCED_PARAMETER(PayloadBlobSize);
-    UNREFERENCED_PARAMETER(HashValue);
-    UNREFERENCED_PARAMETER(HashSize);
-    UNREFERENCED_PARAMETER(RejectDetail);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterCreateEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterUpdateEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(RejectDetail);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterGetEnrollmentStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(RejectDetail);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterGetEnrollmentHash(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PUCHAR *HashValue,
-    _Out_ PSIZE_T HashSize
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(HashValue);
-    UNREFERENCED_PARAMETER(HashSize);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterCheckForDuplicate(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_IDENTITY Identity,
-    _Out_ PWINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _Out_ PBOOLEAN Duplicate
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-    UNREFERENCED_PARAMETER(Duplicate);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterCommitEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _In_ PUCHAR PayloadBlob,
-    _In_ SIZE_T PayloadBlobSize
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-    UNREFERENCED_PARAMETER(PayloadBlob);
-    UNREFERENCED_PARAMETER(PayloadBlobSize);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterDiscardEnrollment(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-EngineAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.def b/biometrics/adapters/engine_adapter/EngineAdapter.def
deleted file mode 100644
index 8f8b458f..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY	EngineAdapter
-
-EXPORTS
-    WbioQueryEngineInterface
diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.h b/biometrics/adapters/engine_adapter/EngineAdapter.h
deleted file mode 100644
index 1be2cd6d..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    EngineAdapter.h
-
-Abstract:
-
-    This module contains a stub implementation of an Engine Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-#include "winbio_adapter.h"
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// The WINIBIO_ENGINE_CONTEXT structure is privately-defined by each
-// Engine Adapter. Its purpose is to maintain any information that
-// should persist across Engine Adapter API calls. 
-//
-// The Adapter allocates and initializes one of these structures in its
-// 'Attach' routine and saves its address in the Pipeline->EngineContext 
-// field.
-//
-// The Engine Adapter's 'Detach' routine cleans up and deallocates the
-// structure and sets the PipelineContext->EngineContext field to NULL.
-//
-///////////////////////////////////////////////////////////////////////////////
-typedef struct _WINIBIO_ENGINE_CONTEXT {
-    //
-    // The following fields illustrate the kind of information 
-    // the Engine Adapter needs to keep in this structure:
-    //
-    //      FeatureSet      - A processed description of a biometric
-    //                        sample.
-    //
-    //      Enrollment      - An object that tracks the current state
-    //                        of an in-progress enrollment operation.
-    //
-    //      Template        - A template either created from the Feature
-    //                        Set or from the Enrollment object.
-    //
-    //      Comparison      - An object that tracks the result of a
-    //                        one-to-one comparison between the Template
-    //                        and the Feature Set.
-    //
-    PVOID x;
-    PVOID y;
-    PVOID z;
-
-} WINIBIO_ENGINE_CONTEXT, *PWINIBIO_ENGINE_CONTEXT;
-
diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.rc b/biometrics/adapters/engine_adapter/EngineAdapter.rc
deleted file mode 100644
index d2a99f20..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-
-#include <windows.h>
-#include <ntverp.h>
-#include "resource.h"
-
-//
-// TODO: Change the file description and file names to match your binary.
-//
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Engine Adapter Sample"
-#define VER_INTERNALNAME_STR        "EngineAdapter"
-#define VER_ORIGINALFILENAME_STR    "EngineAdapter.dll"
-
-#include "common.ver"
diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj b/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj
deleted file mode 100644
index 4c462ac4..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{22EED378-7FE9-4946-A653-05BB1EE20717}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
-    <RequiresPackageProject>true</RequiresPackageProject>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{9263013E-19E1-41D9-B085-8892CE56B9BB}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>EngineAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>EngineAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>EngineAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>EngineAdapter</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>EngineAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>EngineAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>EngineAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>EngineAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="EngineAdapter.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Use</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="precompsrc.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Create</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ResourceCompile Include="EngineAdapter.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
-    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
-    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
-    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj.Filters b/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj.Filters
deleted file mode 100644
index ab887f28..00000000
--- a/biometrics/adapters/engine_adapter/EngineAdapter.vcxproj.Filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{010878EC-7BA3-41C4-B355-5556C237FDE3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{64493738-BBBD-46B2-995D-EF8EE18A251D}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{E0C063ED-18D1-4D6B-A62A-5E6CF79522C1}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="EngineAdapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="precompsrc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="EngineAdapter.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="EngineAdapter.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/engine_adapter/precomp.h b/biometrics/adapters/engine_adapter/precomp.h
deleted file mode 100644
index c36eb36c..00000000
--- a/biometrics/adapters/engine_adapter/precomp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    precomp.h
-
-Abstract:
-
-    This module contains identifies all the headers that
-    shoulde be pre-compiled.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-//
-// Necessary for compiling under VC.
-//
-#if(!defined(WINVER) || (WINVER < 0x0500))
-	#undef WINVER
-	#define WINVER          0x0500
-#endif
-#if(!defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500))
-	#undef _WIN32_WINNT
-	#define _WIN32_WINNT    0x0500
-#endif
-
-//
-// Required header files that shouldn't change often.
-//
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-
-//
-// StrSafe.h needs to be included last
-// to disallow unsafe string functions.
-#include <STRSAFE.H>
-
-#ifndef ARGUMENT_PRESENT
-#define ARGUMENT_PRESENT(x) ((x) != NULL)
-#endif
diff --git a/biometrics/adapters/engine_adapter/precompsrc.cpp b/biometrics/adapters/engine_adapter/precompsrc.cpp
deleted file mode 100644
index 5944cf51..00000000
--- a/biometrics/adapters/engine_adapter/precompsrc.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "precomp.h"
\ No newline at end of file
diff --git a/biometrics/adapters/engine_adapter/resource.h b/biometrics/adapters/engine_adapter/resource.h
deleted file mode 100644
index 95ed37fa..00000000
--- a/biometrics/adapters/engine_adapter/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-#pragma once
-
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.cpp b/biometrics/adapters/sensor_adapter/SensorAdapter.cpp
deleted file mode 100644
index 0e5345aa..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.cpp
+++ /dev/null
@@ -1,485 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    SensorAdapter.cpp
-
-Abstract:
-
-    This module contains a stub implementation of a Sensor Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Header files...
-//
-///////////////////////////////////////////////////////////////////////////////
-#include "precomp.h"
-#include "winbio_adapter.h"
-#include "SensorAdapter.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Forward declarations for the Engine Adapter's interface routines...
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-SensorAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterQueryStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_SENSOR_STATUS Status
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterReset(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterSetMode(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_SENSOR_MODE Mode
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterSetIndicatorStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_INDICATOR_STATUS IndicatorStatus
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterGetIndicatorStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_INDICATOR_STATUS IndicatorStatus
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterStartCapture(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _Out_ LPOVERLAPPED *Overlapped
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterFinishCapture(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterClearCaptureBuffer(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterExportSensorData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_BIR *SampleBuffer,
-    _Out_ PSIZE_T SampleSize
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterCancel(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterPushDataToEngine(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _In_ WINBIO_BIR_DATA_FLAGS Flags,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-
-static HRESULT
-WINAPI
-SensorAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Interface dispatch table
-//
-///////////////////////////////////////////////////////////////////////////////
-static WINBIO_SENSOR_INTERFACE g_SensorInterface = {
-    WINBIO_STORAGE_INTERFACE_VERSION_1,
-    WINBIO_ADAPTER_TYPE_SENSOR,
-    sizeof(WINBIO_SENSOR_INTERFACE),
-    {0xa545298c, 0xec34, 0x4306, {0x84, 0x12, 0x83, 0x12, 0x5d, 0xca, 0xfa, 0xe1}},
-
-    SensorAdapterAttach,
-    SensorAdapterDetach,
-    SensorAdapterClearContext,
-    SensorAdapterQueryStatus,
-    SensorAdapterReset,
-    SensorAdapterSetMode,
-    SensorAdapterSetIndicatorStatus,
-    SensorAdapterGetIndicatorStatus,
-    SensorAdapterStartCapture,
-    SensorAdapterFinishCapture,
-    SensorAdapterExportSensorData,
-    SensorAdapterCancel,
-    SensorAdapterPushDataToEngine,
-    SensorAdapterControlUnit,
-    SensorAdapterControlUnitPrivileged
-};
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Mandatory DLL entrypoint function.
-//
-///////////////////////////////////////////////////////////////////////////////
-BOOL APIENTRY 
-DllMain( 
-    HANDLE ModuleHandle, 
-    DWORD ReasonForCall, 
-    LPVOID Reserved
-    )
-{
-    UNREFERENCED_PARAMETER(ModuleHandle);
-    UNREFERENCED_PARAMETER(ReasonForCall);
-    UNREFERENCED_PARAMETER(Reserved);
-
-    return TRUE;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Well-known interface-discovery function exported by the Sensor Adapter
-//
-///////////////////////////////////////////////////////////////////////////////
-HRESULT
-WINAPI
-WbioQuerySensorInterface(
-    _Out_ PWINBIO_SENSOR_INTERFACE *SensorInterface
-    )
-{
-    *SensorInterface = &g_SensorInterface;
-    return S_OK;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Storage Adapter action routines
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-SensorAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterQueryStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_SENSOR_STATUS Status
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Status);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterReset(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterSetMode(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_SENSOR_MODE Mode
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Mode);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterSetIndicatorStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_INDICATOR_STATUS IndicatorStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(IndicatorStatus);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterGetIndicatorStatus(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_INDICATOR_STATUS IndicatorStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(IndicatorStatus);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterStartCapture(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _Out_ LPOVERLAPPED *Overlapped
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Purpose);
-    UNREFERENCED_PARAMETER(Overlapped);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterFinishCapture(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(RejectDetail);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-//
-// Export raw capture buffer
-//
-static HRESULT
-WINAPI
-SensorAdapterExportSensorData(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_BIR *SampleBuffer,
-    _Out_ PSIZE_T SampleSize
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(SampleBuffer);
-    UNREFERENCED_PARAMETER(SampleSize);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterCancel(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-//
-// Push current sample into the Engine and
-// convert it into a feature set for use in
-// additional processing.
-//
-static HRESULT
-WINAPI
-SensorAdapterPushDataToEngine(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIR_PURPOSE Purpose,
-    _In_ WINBIO_BIR_DATA_FLAGS Flags,
-    _Out_ PWINBIO_REJECT_DETAIL RejectDetail
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Purpose);
-    UNREFERENCED_PARAMETER(Flags);
-    UNREFERENCED_PARAMETER(RejectDetail);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
-
-static HRESULT
-WINAPI
-SensorAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-///////////////////////////////////////////////////////////////////////////////
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.def b/biometrics/adapters/sensor_adapter/SensorAdapter.def
deleted file mode 100644
index e2534008..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY	SensorAdapter
-
-EXPORTS
-    WbioQuerySensorInterface
-
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.h b/biometrics/adapters/sensor_adapter/SensorAdapter.h
deleted file mode 100644
index f70c3f51..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    SensorAdapter.h
-
-Abstract:
-
-    This module contains a stub implementation of an Sensor Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-#include "winbio_adapter.h"
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// The WINIBIO_SENSOR_CONTEXT structure is privately-defined by each
-// Sensor Adapter. Its purpose is to maintain any information that
-// should persist across Sensor Adapter API calls. 
-//
-// The Adapter allocates and initializes one of these structures in its
-// 'Attach' routine and saves its address in the Pipeline->SensorContext 
-// field.
-//
-// The Sensor Adapter's 'Detach' routine cleans up and deallocates the
-// structure and sets the PipelineContext->SensorContext field to NULL.
-//
-///////////////////////////////////////////////////////////////////////////////
-typedef struct _WINIBIO_SENSOR_CONTEXT {
-    //
-    // The following fields illustrate the kind of information 
-    // the Sensor Adapter needs to keep in this structure:
-    //
-    //      SampleBuffer    - A pointer to the most-recently-captured
-    //                        data sample from the sensor device.
-    //
-    //      SampleSize      - Count of the number of bytes in the
-    //                        sample buffer.
-    //
-    PWINBIO_BIR SampleBuffer;
-    SIZE_T SampleSize;
-
-} WINIBIO_SENSOR_CONTEXT, *PWINIBIO_SENSOR_CONTEXT;
-
-
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.rc b/biometrics/adapters/sensor_adapter/SensorAdapter.rc
deleted file mode 100644
index 0c08a208..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-
-#include <windows.h>
-#include <ntverp.h>
-#include "resource.h"
-
-//
-// TODO: Change the file description and file names to match your binary.
-//
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Sensor Adapter Sample"
-#define VER_INTERNALNAME_STR        "SensorAdapter"
-#define VER_ORIGINALFILENAME_STR    "SensorAdapter.dll"
-
-#include "common.ver"
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj b/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj
deleted file mode 100644
index 166f8076..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{321860DA-56D9-427A-A5C2-346DFE8FB529}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
-    <RequiresPackageProject>true</RequiresPackageProject>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{6166C525-23D0-4D3C-8DD3-1E3CB527FA23}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>SensorAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>SensorAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>SensorAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>SensorAdapter</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>SensorAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>SensorAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>SensorAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>SensorAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="precompsrc.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Create</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="SensorAdapter.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Use</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ResourceCompile Include="SensorAdapter.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
-    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
-    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
-    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj.Filters b/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj.Filters
deleted file mode 100644
index 53f0b241..00000000
--- a/biometrics/adapters/sensor_adapter/SensorAdapter.vcxproj.Filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{51205C64-E853-46B7-8706-03C4F355D3FB}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{65E3A5BF-7427-4CB0-B6C7-F47537AC67BB}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{05AE8E4A-3180-403D-BFB9-122DD85E0D1A}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="precompsrc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SensorAdapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="SensorAdapter.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SensorAdapter.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/sensor_adapter/precomp.h b/biometrics/adapters/sensor_adapter/precomp.h
deleted file mode 100644
index c36eb36c..00000000
--- a/biometrics/adapters/sensor_adapter/precomp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    precomp.h
-
-Abstract:
-
-    This module contains identifies all the headers that
-    shoulde be pre-compiled.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-//
-// Necessary for compiling under VC.
-//
-#if(!defined(WINVER) || (WINVER < 0x0500))
-	#undef WINVER
-	#define WINVER          0x0500
-#endif
-#if(!defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500))
-	#undef _WIN32_WINNT
-	#define _WIN32_WINNT    0x0500
-#endif
-
-//
-// Required header files that shouldn't change often.
-//
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-
-//
-// StrSafe.h needs to be included last
-// to disallow unsafe string functions.
-#include <STRSAFE.H>
-
-#ifndef ARGUMENT_PRESENT
-#define ARGUMENT_PRESENT(x) ((x) != NULL)
-#endif
diff --git a/biometrics/adapters/sensor_adapter/precompsrc.cpp b/biometrics/adapters/sensor_adapter/precompsrc.cpp
deleted file mode 100644
index 5944cf51..00000000
--- a/biometrics/adapters/sensor_adapter/precompsrc.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "precomp.h"
\ No newline at end of file
diff --git a/biometrics/adapters/sensor_adapter/resource.h b/biometrics/adapters/sensor_adapter/resource.h
deleted file mode 100644
index 95ed37fa..00000000
--- a/biometrics/adapters/sensor_adapter/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-#pragma once
-
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.cpp b/biometrics/adapters/storage_adapter/StorageAdapter.cpp
deleted file mode 100644
index 4e5cfb66..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    Storage.cpp
-
-Abstract:
-
-    This module contains a stub implementation of a Storage Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Header files...
-//
-///////////////////////////////////////////////////////////////////////////////
-#include "precomp.h"
-#include "winbio_adapter.h"
-#include "StorageAdapter.h"
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Forward declarations for the Storage Adapter's interface routines...
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-StorageAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterCreateDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ WINBIO_BIOMETRIC_TYPE Factor,
-    _In_ PWINBIO_UUID Format,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString,
-    _In_ SIZE_T IndexElementCount,
-    _In_ SIZE_T InitialSize
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterEraseDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterOpenDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterCloseDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterGetDataFormat(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_UUID Format,
-    _Out_ PWINBIO_VERSION Version
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterGetDatabaseSize(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T AvailableRecordCount,
-    _Out_ PSIZE_T TotalRecordCount
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterAddRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_STORAGE_RECORD RecordContents
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterDeleteRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterQueryBySubject(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterQueryByContent(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _In_ ULONG IndexVector[],
-    _In_ SIZE_T IndexElementCount
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterGetRecordCount(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T RecordCount
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterFirstRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterNextRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterGetCurrentRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_STORAGE_RECORD RecordContents
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-
-static HRESULT
-WINAPI
-StorageAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    );
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Interface dispatch table
-//
-///////////////////////////////////////////////////////////////////////////////
-static WINBIO_STORAGE_INTERFACE g_StorageInterface = {
-    WINBIO_STORAGE_INTERFACE_VERSION_1,
-    WINBIO_ADAPTER_TYPE_STORAGE,
-    sizeof(WINBIO_STORAGE_INTERFACE),
-    {0x7f6c2610, 0xfdba, 0x41a3, {0xae, 0x1c, 0x8f, 0xd5, 0x84, 0x59, 0x8d, 0x13}},
-
-    StorageAdapterAttach,
-    StorageAdapterDetach,
-    StorageAdapterClearContext,
-    StorageAdapterCreateDatabase,
-    StorageAdapterEraseDatabase,
-    StorageAdapterOpenDatabase,
-    StorageAdapterCloseDatabase,
-    StorageAdapterGetDataFormat,
-    StorageAdapterGetDatabaseSize,
-    StorageAdapterAddRecord,
-    StorageAdapterDeleteRecord,
-    StorageAdapterQueryBySubject,
-    StorageAdapterQueryByContent,
-    StorageAdapterGetRecordCount,
-    StorageAdapterFirstRecord,
-    StorageAdapterNextRecord,
-    StorageAdapterGetCurrentRecord,
-    StorageAdapterControlUnit,
-    StorageAdapterControlUnitPrivileged
-};
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Mandatory DLL entrypoint function.
-//
-///////////////////////////////////////////////////////////////////////////////
-BOOL APIENTRY 
-DllMain( 
-    HANDLE ModuleHandle, 
-    DWORD ReasonForCall, 
-    LPVOID Reserved
-    )
-{
-    UNREFERENCED_PARAMETER(ModuleHandle);
-    UNREFERENCED_PARAMETER(ReasonForCall);
-    UNREFERENCED_PARAMETER(Reserved);
-
-    return TRUE;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Well-known interface-discovery function exported by the Storage Adapter
-//
-///////////////////////////////////////////////////////////////////////////////
-HRESULT
-WINAPI
-WbioQueryStorageInterface(
-    _Out_ PWINBIO_STORAGE_INTERFACE *StorageInterface
-    )
-{
-    *StorageInterface = &g_StorageInterface;
-    return S_OK;
-}
-//-----------------------------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Storage Adapter action routines
-//
-///////////////////////////////////////////////////////////////////////////////
-static HRESULT
-WINAPI
-StorageAdapterAttach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterDetach(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterClearContext(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterCreateDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ WINBIO_BIOMETRIC_TYPE Factor,
-    _In_ PWINBIO_UUID Format,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString,
-    _In_ SIZE_T IndexElementCount,
-    _In_ SIZE_T InitialSize
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(DatabaseId);
-    UNREFERENCED_PARAMETER(Factor);
-    UNREFERENCED_PARAMETER(Format);
-    UNREFERENCED_PARAMETER(FilePath);
-    UNREFERENCED_PARAMETER(ConnectString);
-    UNREFERENCED_PARAMETER(IndexElementCount);
-    UNREFERENCED_PARAMETER(InitialSize);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterEraseDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(DatabaseId);
-    UNREFERENCED_PARAMETER(FilePath);
-    UNREFERENCED_PARAMETER(ConnectString);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterOpenDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_UUID DatabaseId,
-    _In_ LPCWSTR FilePath,
-    _In_ LPCWSTR ConnectString
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(DatabaseId);
-    UNREFERENCED_PARAMETER(FilePath);
-    UNREFERENCED_PARAMETER(ConnectString);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterCloseDatabase(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterGetDataFormat(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_UUID Format,
-    _Out_ PWINBIO_VERSION Version
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Format);
-    UNREFERENCED_PARAMETER(Version);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterGetDatabaseSize(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T AvailableRecordCount,
-    _Out_ PSIZE_T TotalRecordCount
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(AvailableRecordCount);
-    UNREFERENCED_PARAMETER(TotalRecordCount);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterAddRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_STORAGE_RECORD RecordContents
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(RecordContents);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterDeleteRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterQueryBySubject(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ PWINBIO_IDENTITY Identity,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(Identity);
-    UNREFERENCED_PARAMETER(SubFactor);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterQueryByContent(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ WINBIO_BIOMETRIC_SUBTYPE SubFactor,
-    _In_ ULONG IndexVector[],
-    _In_ SIZE_T IndexElementCount
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(SubFactor);
-    UNREFERENCED_PARAMETER(IndexVector);
-    UNREFERENCED_PARAMETER(IndexElementCount);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterGetRecordCount(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PSIZE_T RecordCount
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(RecordCount);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterFirstRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterNextRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterGetCurrentRecord(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _Out_ PWINBIO_STORAGE_RECORD RecordContents
-    )
-{
-   UNREFERENCED_PARAMETER(Pipeline);
-   UNREFERENCED_PARAMETER(RecordContents);
-
-   return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterControlUnit(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-static HRESULT
-WINAPI
-StorageAdapterControlUnitPrivileged(
-    _Inout_ PWINBIO_PIPELINE Pipeline,
-    _In_ ULONG ControlCode,
-    _In_ PUCHAR SendBuffer,
-    _In_ SIZE_T SendBufferSize,
-    _In_ PUCHAR ReceiveBuffer,
-    _In_ SIZE_T ReceiveBufferSize,
-    _Out_ PSIZE_T ReceiveDataSize,
-    _Out_ PULONG OperationStatus
-    )
-{
-    UNREFERENCED_PARAMETER(Pipeline);
-    UNREFERENCED_PARAMETER(ControlCode);
-    UNREFERENCED_PARAMETER(SendBuffer);
-    UNREFERENCED_PARAMETER(SendBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveBuffer);
-    UNREFERENCED_PARAMETER(ReceiveBufferSize);
-    UNREFERENCED_PARAMETER(ReceiveDataSize);
-    UNREFERENCED_PARAMETER(OperationStatus);
-
-    return E_NOTIMPL;
-}
-//-----------------------------------------------------------------------------
-
-
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.def b/biometrics/adapters/storage_adapter/StorageAdapter.def
deleted file mode 100644
index 685b9f3f..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY	StorageAdapter
-
-EXPORTS
-    WbioQueryStorageInterface
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.h b/biometrics/adapters/storage_adapter/StorageAdapter.h
deleted file mode 100644
index d0259213..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    StorageAdapter.h
-
-Abstract:
-
-    This module contains a stub implementation of a Storage Adapter
-    plug-in for the Windows Biometric service.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-#include "winbio_adapter.h"
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// The WINIBIO_STORAGE_CONTEXT structure is privately-defined by each
-// Storage Adapter. Its purpose is to maintain any information that
-// should persist across Storage Adapter API calls. 
-//
-// The Adapter allocates and initializes one of these structures in its
-// 'Attach' routine and saves its address in the Pipeline->StorageContext 
-// field.
-//
-// The Storage Adapter's 'Detach' routine cleans up and deallocates the
-// structure and sets the PipelineContext->StorageContext field to NULL.
-//
-///////////////////////////////////////////////////////////////////////////////
-typedef struct _WINIBIO_STORAGE_CONTEXT {
-    //
-    // The following fields illustrate the kind of information 
-    // the Storage Adapter needs to keep in this structure:
-    //
-    //      DatabaseId      - Identify of the Adapter's 
-    //                        currently-opened database.
-    //
-    //      DatabaseHandle  - A handle to the Storage Adapter's 
-    //                        currently-open database.
-    //
-    //      ResultSet       - A collection of records generated by
-    //                        a database query operation. 
-    //
-    //      ResultSetCursor - Current location in the result 
-    //                        set. Used to iterate through the
-    //                        result set and make individual
-    //                        records available.
-    //
-    WINBIO_UUID DatabaseId;
-    PVOID DatabaseHandle;
-    PVOID ResultSet;
-    PVOID ResultSetCursor;
-
-} WINIBIO_STORAGE_CONTEXT, *PWINIBIO_STORAGE_CONTEXT;
-
-
-
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.rc b/biometrics/adapters/storage_adapter/StorageAdapter.rc
deleted file mode 100644
index 332ed60c..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-
-#include <windows.h>
-#include <ntverp.h>
-#include "resource.h"
-
-//
-// TODO: Change the file description and file names to match your binary.
-//
-
-#define VER_FILETYPE                VFT_DLL
-#define VER_FILESUBTYPE             VFT_UNKNOWN
-#define VER_FILEDESCRIPTION_STR     "Storage Adapter Sample"
-#define VER_INTERNALNAME_STR        "StorageAdapter"
-#define VER_ORIGINALFILENAME_STR    "StorageAdapter.dll"
-
-#include "common.ver"
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj b/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj
deleted file mode 100644
index 217ba760..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{339A0554-2E3D-4A12-B45C-8E2D7D59D7C2}</ProjectGuid>
-    <RootNamespace>$(MSBuildProjectName)</RootNamespace>
-    <SupportsPackaging>false</SupportsPackaging>
-    <RequiresPackageProject>true</RequiresPackageProject>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <SampleGuid>{A09D774C-A1A4-4648-8599-3905585E696B}</SampleGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetVersion>Windows10</TargetVersion>
-    <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
-    <DriverType />
-    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <OutDir>$(IntDir)</OutDir>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
-  </ImportGroup>
-  <ItemGroup Label="WrappedTaskItems" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>StorageAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>StorageAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>StorageAdapter</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>StorageAdapter</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <EntryPointSymbol Condition="'$(Platform)'=='win32'">_DllMainCRTStartup@12</EntryPointSymbol>
-      <EntryPointSymbol Condition="'$(Platform)'!='win32'">_DllMainCRTStartup</EntryPointSymbol>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>StorageAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>StorageAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>StorageAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-    </ClCompile>
-    <Midl>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions);_UNICODE;UNICODE</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies);advapi32.lib;kernel32.lib;user32.lib</AdditionalDependencies>
-      <ModuleDefinitionFile>StorageAdapter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="precompsrc.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Create</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ClCompile Include="StorageAdapter.cpp">
-      <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreCompiledHeaderFile>precomp.h</PreCompiledHeaderFile>
-      <PreCompiledHeader>Use</PreCompiledHeader>
-      <PreCompiledHeaderOutputFile>$(IntDir)\precomp.h.pch</PreCompiledHeaderOutputFile>
-    </ClCompile>
-    <ResourceCompile Include="StorageAdapter.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Exclude="@(Inf)" Include="*.inf" />
-    <FilesToPackage Include="$(TargetPath)" Condition="'$(ConfigurationType)'=='Driver' or '$(ConfigurationType)'=='DynamicLibrary'" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Exclude="@(None)" Include="*.txt;*.htm;*.html" />
-    <None Exclude="@(None)" Include="*.ico;*.cur;*.bmp;*.dlg;*.rct;*.gif;*.jpg;*.jpeg;*.wav;*.jpe;*.tiff;*.tif;*.png;*.rc2" />
-    <None Exclude="@(None)" Include="*.def;*.bat;*.hpj;*.asmx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Exclude="@(ClInclude)" Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj.Filters b/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj.Filters
deleted file mode 100644
index 92876497..00000000
--- a/biometrics/adapters/storage_adapter/StorageAdapter.vcxproj.Filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
-      <UniqueIdentifier>{EE3BFC89-6F03-422C-B8F1-B4F4764C10BB}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-      <UniqueIdentifier>{C5BD080B-5F54-4E1D-A8EB-7CD4F15F93CA}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
-      <UniqueIdentifier>{105F62EC-5AF7-4EA7-BC5B-07BBDD5C3611}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="precompsrc.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="StorageAdapter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <None Include="StorageAdapter.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="StorageAdapter.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/biometrics/adapters/storage_adapter/precomp.h b/biometrics/adapters/storage_adapter/precomp.h
deleted file mode 100644
index c36eb36c..00000000
--- a/biometrics/adapters/storage_adapter/precomp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*++
- 
-    THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-    ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-    PARTICULAR PURPOSE.
-
-    Copyright (c) Microsoft Corporation. All rights reserved
-
-Module Name:
-
-    precomp.h
-
-Abstract:
-
-    This module contains identifies all the headers that
-    shoulde be pre-compiled.
-
-Author:
-
-    -
-
-Environment:
-
-    Win32, user mode only.
-
-Revision History:
-
-NOTES:
-
-    (None)
-
---*/
-#pragma once
-
-//
-// Necessary for compiling under VC.
-//
-#if(!defined(WINVER) || (WINVER < 0x0500))
-	#undef WINVER
-	#define WINVER          0x0500
-#endif
-#if(!defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0500))
-	#undef _WIN32_WINNT
-	#define _WIN32_WINNT    0x0500
-#endif
-
-//
-// Required header files that shouldn't change often.
-//
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-
-//
-// StrSafe.h needs to be included last
-// to disallow unsafe string functions.
-#include <STRSAFE.H>
-
-#ifndef ARGUMENT_PRESENT
-#define ARGUMENT_PRESENT(x) ((x) != NULL)
-#endif
diff --git a/biometrics/adapters/storage_adapter/precompsrc.cpp b/biometrics/adapters/storage_adapter/precompsrc.cpp
deleted file mode 100644
index 5944cf51..00000000
--- a/biometrics/adapters/storage_adapter/precompsrc.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "precomp.h"
\ No newline at end of file
diff --git a/biometrics/adapters/storage_adapter/resource.h b/biometrics/adapters/storage_adapter/resource.h
deleted file mode 100644
index 95ed37fa..00000000
--- a/biometrics/adapters/storage_adapter/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//---------------------------------------------------------------------------
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
-// PARTICULAR PURPOSE.
-//
-// Copyright (c) Microsoft Corporation. All rights reserved
-//
-// BioUsbSample.rc
-//
-// Copyright (c) 2007 Microsoft Corporation, All Rights Reserved
-//---------------------------------------------------------------------------
-
-#pragma once
-