diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp
index 36f69c2130..6318467873 100644
--- a/runtime/context/context.cpp
+++ b/runtime/context/context.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -131,7 +131,7 @@ bool Context::createImpl(const cl_context_properties *properties,
             break;
         default:
             if (!sharingBuilder->processProperties(propertyType, propertyValue, errcodeRet)) {
-                errcodeRet = createContextOsProperties(propertyType, propertyValue);
+                errcodeRet = CL_INVALID_PROPERTY;
             }
             break;
         }
diff --git a/runtime/context/context.h b/runtime/context/context.h
index 068898a95a..6746e77e46 100644
--- a/runtime/context/context.h
+++ b/runtime/context/context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -128,7 +128,6 @@ class Context : public BaseObject<_cl_context> {
             void *userData = nullptr);
 
     // OS specific implementation
-    cl_int createContextOsProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue);
     void *getOsContextInfo(cl_context_info &paramName, size_t *srcParamSize);
 
     const cl_context_properties *properties;
diff --git a/runtime/os_interface/linux/api.cpp b/runtime/os_interface/linux/api.cpp
index d799e3734c..bce16dab10 100644
--- a/runtime/os_interface/linux/api.cpp
+++ b/runtime/os_interface/linux/api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -52,10 +52,6 @@ void OCLRT::Image::getOsSpecificImageInfo(const cl_image_info &paramName, size_t
     }
 }
 
-cl_int OCLRT::Context::createContextOsProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue) {
-    return CL_INVALID_PROPERTY;
-}
-
 void *OCLRT::Context::getOsContextInfo(cl_context_info &paramName, size_t *srcParamSize) {
     return nullptr;
 }
diff --git a/runtime/os_interface/windows/api.cpp b/runtime/os_interface/windows/api.cpp
index 86387c08a8..3365f43af6 100644
--- a/runtime/os_interface/windows/api.cpp
+++ b/runtime/os_interface/windows/api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -81,10 +81,6 @@ void OCLRT::Image::getOsSpecificImageInfo(const cl_mem_info &paramName, size_t *
     }
 }
 
-cl_int OCLRT::Context::createContextOsProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue) {
-    return CL_INVALID_PROPERTY;
-}
-
 void *OCLRT::Context::getOsContextInfo(cl_context_info &paramName, size_t *srcParamSize) {
     switch (paramName) {
     case CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR:
diff --git a/unit_tests/context/context_negative_tests.cpp b/unit_tests/context/context_negative_tests.cpp
index 64a85dab87..282eade557 100644
--- a/unit_tests/context/context_negative_tests.cpp
+++ b/unit_tests/context/context_negative_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -65,7 +65,7 @@ TEST(InvalidPropertyContextTest, GivenInvalidPropertiesWhenContextIsCreatedThenE
     cl_platform_id pid[1];
     pid[0] = pPlatform;
     cl_context_properties invalidProperties[5] = {CL_CONTEXT_PLATFORM, (cl_context_properties)pid[0], CL_CGL_SHAREGROUP_KHR, 0x10000, 0};
-    cl_context_properties invalidProperties2[5] = {CL_CONTEXT_PLATFORM, (cl_context_properties)pid[0], 0x200D, 0x10000, 0};
+    cl_context_properties invalidProperties2[5] = {CL_CONTEXT_PLATFORM, (cl_context_properties)pid[0], (cl_context_properties)0xdeadbeef, 0x10000, 0};
 
     cl_int retVal = 0;
     auto context = Context::create<Context>(invalidProperties, DeviceVector(&deviceID, 1), nullptr,