diff --git a/casadm/extended_err_msg.c b/casadm/extended_err_msg.c
index 624b0ac..6c5ee20 100644
--- a/casadm/extended_err_msg.c
+++ b/casadm/extended_err_msg.c
@@ -170,10 +170,6 @@ struct {
 		OCF_ERR_NO_LOCK,
 		"Failed to lock cache for management operation."
 	},
-	{
-		OCF_ERR_METADATA_LAYOUT_MISMATCH,
-		"Metadata layout mismatch"
-	},
 	{
 		OCF_ERR_CACHE_LINE_SIZE_MISMATCH,
 		"Cache line size mismatch"
diff --git a/modules/cas_cache/utils/cas_err.h b/modules/cas_cache/utils/cas_err.h
index ebeff57..01f229d 100644
--- a/modules/cas_cache/utils/cas_err.h
+++ b/modules/cas_cache/utils/cas_err.h
@@ -51,7 +51,6 @@ static struct cas_error_map_entry cas_ocf_error_map[] = {
 	{ OCF_ERR_CACHE_NAME_MISMATCH,		EINVAL	},
 	{ OCF_ERR_INVAL_CACHE_DEV,		EINVAL	},
 	{ OCF_ERR_CORE_UUID_EXISTS,		EINVAL	},
-	{ OCF_ERR_METADATA_LAYOUT_MISMATCH,	EINVAL	},
 	{ OCF_ERR_CACHE_LINE_SIZE_MISMATCH,	EINVAL	},
 	{ OCF_ERR_CACHE_STANDBY,		EBUSY	},
 };
diff --git a/ocf b/ocf
index be4927f..4690cd6 160000
--- a/ocf
+++ b/ocf
@@ -1 +1 @@
-Subproject commit be4927f52409c5eb0bcb2078a6e536fd1e9c3cf8
+Subproject commit 4690cd60fea0645cf8207d7fbba2b318783b10f4