diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/Enums/QueryInformationLevel.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Enums/QueryInformationLevel.cs
index 3f441ea..cf02081 100644
--- a/SMBLibrary/SMB1/Transaction2Subcommands/Enums/QueryInformationLevel.cs
+++ b/SMBLibrary/SMB1/Transaction2Subcommands/Enums/QueryInformationLevel.cs
@@ -6,8 +6,8 @@ namespace SMBLibrary.SMB1
         SMB_INFO_STANDARD = 0x0001,            // LANMAN2.0
         SMB_INFO_QUERY_EA_SIZE = 0x0002,       // LANMAN2.0
         SMB_INFO_QUERY_EAS_FROM_LIST = 0x0003, // LANMAN2.0
-        SMB_INFO_QUERY_ALL_EAS = 0x0004,
-        SMB_INFO_IS_NAME_VALID = 0x0006,
+        SMB_INFO_QUERY_ALL_EAS = 0x0004,       // LANMAN2.0
+        SMB_INFO_IS_NAME_VALID = 0x0006,       // LANMAN2.0
         SMB_QUERY_FILE_BASIC_INFO = 0x0101,
         SMB_QUERY_FILE_STANDARD_INFO = 0x0102,
         SMB_QUERY_FILE_EA_INFO = 0x0103,
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryAllExtendedAttributes.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryAllExtendedAttributes.cs
deleted file mode 100644
index fc2c31e..0000000
--- a/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryAllExtendedAttributes.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
- * 
- * You can redistribute this program and/or modify it under the terms of
- * the GNU Lesser Public License as published by the Free Software Foundation,
- * either version 3 of the License, or (at your option) any later version.
- */
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Utilities;
-
-namespace SMBLibrary.SMB1
-{
-    /// <summary>
-    /// SMB_INFO_QUERY_ALL_EAS
-    /// </summary>
-    public class QueryAllExtendedAttributes : QueryInformation
-    {
-        public FullExtendedAttributeList ExtendedAttributeList;
-
-        public QueryAllExtendedAttributes()
-        {
-            ExtendedAttributeList = new FullExtendedAttributeList();
-        }
-
-        public QueryAllExtendedAttributes(byte[] buffer, int offset)
-        {
-            ExtendedAttributeList = new FullExtendedAttributeList(buffer, offset);
-        }
-
-        public override byte[] GetBytes()
-        {
-            return ExtendedAttributeList.GetBytes();
-        }
-
-        public override QueryInformationLevel InformationLevel
-        {
-            get
-            {
-                return QueryInformationLevel.SMB_INFO_QUERY_ALL_EAS;
-            }
-        }
-    }
-}
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs
index e97e45e..42de3ed 100644
--- a/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs
+++ b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -20,15 +20,10 @@ namespace SMBLibrary.SMB1
             get;
         }
 
-        /// <summary>
-        /// SMB_INFO_IS_NAME_VALID will return null
-        /// </summary>
         public static QueryInformation GetQueryInformation(byte[] buffer, QueryInformationLevel informationLevel)
         {
             switch (informationLevel)
             {
-                case QueryInformationLevel.SMB_INFO_QUERY_ALL_EAS:
-                    return new QueryAllExtendedAttributes(buffer, 0);
                 case QueryInformationLevel.SMB_QUERY_FILE_BASIC_INFO:
                     return new QueryFileBasicInfo(buffer, 0);
                 case QueryInformationLevel.SMB_QUERY_FILE_STANDARD_INFO:
diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index 05b8e4c..879aca4 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -391,7 +391,6 @@
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryFSInformation\QueryFSInformation.cs" />
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryFSInformation\QueryFSSizeInfo.cs" />
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryFSInformation\QueryFSVolumeInfo.cs" />
-    <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryInformation\QueryAllExtendedAttributes.cs" />
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryInformation\QueryFileAllInfo.cs" />
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryInformation\QueryFileAltNameInfo.cs" />
     <Compile Include="SMB1\Transaction2Subcommands\Structures\QueryInformation\QueryFileBasicInfo.cs" />
diff --git a/SMBLibrary/Server/SMB1/SMB1FileSystemHelper.Query.cs b/SMBLibrary/Server/SMB1/SMB1FileSystemHelper.Query.cs
index 47d65a9..46abf1e 100644
--- a/SMBLibrary/Server/SMB1/SMB1FileSystemHelper.Query.cs
+++ b/SMBLibrary/Server/SMB1/SMB1FileSystemHelper.Query.cs
@@ -18,16 +18,6 @@ namespace SMBLibrary.Server.SMB1
         {
             switch (informationLevel)
             {
-                case QueryInformationLevel.SMB_INFO_QUERY_ALL_EAS:
-                    {
-                        result = null;
-                        return NTStatus.STATUS_NOT_IMPLEMENTED;
-                    }
-                case QueryInformationLevel.SMB_INFO_IS_NAME_VALID:
-                    {
-                        result = null;
-                        return NTStatus.STATUS_NOT_IMPLEMENTED;
-                    }
                 case QueryInformationLevel.SMB_QUERY_FILE_BASIC_INFO:
                     {
                         QueryFileBasicInfo information = new QueryFileBasicInfo();