diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp
index 0c6e604f..7ab7fc81 100644
--- a/glm/core/type_vec2.hpp
+++ b/glm/core/type_vec2.hpp
@@ -51,26 +51,6 @@ namespace detail
 		//////////////////////////////////////
 		// Data
 
-#	if(GLM_COMPONENT == GLM_COMPONENT_CXXMS)
-		union 
-		{
-			struct{value_type x, y;};
-			struct{value_type r, g;};
-			struct{value_type s, t;};
-
-#           if(defined(GLM_SWIZZLE))
-                _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, x, y)
-                _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, r, g)
-                _GLM_SWIZZLE2_2_MEMBERS(T, P, tvec2, s, t)
-                _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, x, y)
-                _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, r, g)
-                _GLM_SWIZZLE2_3_MEMBERS(T, P, tvec3, s, t)
-                _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, x, y)
-                _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, r, g)
-                _GLM_SWIZZLE2_4_MEMBERS(T, P, tvec4, s, t)
-#           endif//(defined(GLM_SWIZZLE))
-		};
-#	elif(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 		union {value_type x, r, s;};
 		union {value_type y, g, t;};
 
@@ -79,15 +59,6 @@ namespace detail
 			GLM_SWIZZLE_GEN_REF_FROM_VEC2(value_type, P, detail::tvec2, detail::tref2)
 			GLM_SWIZZLE_GEN_VEC_FROM_VEC2(value_type, P, detail::tvec2, detail::tvec2, detail::tvec3, detail::tvec4)
 #		endif//(defined(GLM_SWIZZLE))
-#	else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
-		value_type x, y;
-
-#		if(defined(GLM_SWIZZLE))
-			// Defines all he swizzle operator as functions
-			GLM_SWIZZLE_GEN_REF2_FROM_VEC2_SWIZZLE(value_type, P, detail::tvec2, detail::tref2, x, y)
-			GLM_SWIZZLE_GEN_VEC_FROM_VEC2_COMP(value_type, P, detail::tvec2, detail::tvec2, detail::tvec3, detail::tvec4, x, y)
-#		endif//(defined(GLM_SWIZZLE))
-#	endif//GLM_COMPONENT
 
 		//////////////////////////////////////
 		// Accesses
diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp
index fad362d1..dbe9bbd7 100644
--- a/glm/core/type_vec3.hpp
+++ b/glm/core/type_vec3.hpp
@@ -51,26 +51,6 @@ namespace detail
 		//////////////////////////////////////
 		// Data
 
-#	if(GLM_COMPONENT == GLM_COMPONENT_CXXMS)
-		union 
-		{
-			struct{value_type x, y, z;};
-			struct{value_type r, g, b;};
-			struct{value_type s, t, p;};
-
-#			if(defined(GLM_SWIZZLE))
-				_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, x, y, z)
-				_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, r, g, b)
-				_GLM_SWIZZLE3_2_MEMBERS(T, P, tvec2, s, t, p)
-				_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, x, y, z)
-				_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, r, g, b)
-				_GLM_SWIZZLE3_3_MEMBERS(T, P, tvec3, s, t, p)
-				_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, x, y, z)
-				_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, r, g, b)
-				_GLM_SWIZZLE3_4_MEMBERS(T, P, tvec4, s, t, p)
-#			endif//(defined(GLM_SWIZZLE))
-		};
-#	elif(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 		union {value_type x, r, s;};
 		union {value_type y, g, t;};
 		union {value_type z, b, p;};
@@ -80,15 +60,6 @@ namespace detail
 			GLM_SWIZZLE_GEN_REF_FROM_VEC3(T, P, detail::tvec3, detail::tref2, detail::tref3)
 			GLM_SWIZZLE_GEN_VEC_FROM_VEC3(T, P, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4)
 #		endif//(defined(GLM_SWIZZLE))
-#	else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
-		value_type x, y, z;
-
-#		if(defined(GLM_SWIZZLE))
-			// Defines all he swizzle operator as functions
-			GLM_SWIZZLE_GEN_REF_FROM_VEC3_COMP(T, P, detail::tvec3, detail::tref2, detail::tref3, x, y, z)
-			GLM_SWIZZLE_GEN_VEC_FROM_VEC3_COMP(T, P, detail::tvec3, detail::tvec2, detail::tvec3, detail::tvec4, x, y, z)
-#		endif//(defined(GLM_SWIZZLE))
-#	endif//GLM_COMPONENT
 
 		//////////////////////////////////////
 		// Accesses
diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp
index c3197fee..fd192c4f 100644
--- a/glm/core/type_vec4.hpp
+++ b/glm/core/type_vec4.hpp
@@ -51,26 +51,6 @@ namespace detail
 		//////////////////////////////////////
 		// Data
 
-#	if(GLM_COMPONENT == GLM_COMPONENT_CXXMS)
-		union 
-		{
-			struct {value_type r, g, b, a;};
-			struct {value_type s, t, p, q;};
-			struct {value_type x, y, z, w;};
-			
-#			if(defined(GLM_SWIZZLE))
-				_GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, x, y, z, w)
-				_GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, r, g, b, a)
-				_GLM_SWIZZLE4_2_MEMBERS(T, P, tvec2, s, t, p, q)
-				_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, x, y, z, w)
-				_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, r, g, b, a)
-				_GLM_SWIZZLE4_3_MEMBERS(T, P, tvec3, s, t, p, q)
-				_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, x, y, z, w)
-				_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, r, g, b, a)
-				_GLM_SWIZZLE4_4_MEMBERS(T, P, tvec4, s, t, p, q)
-#			endif//(defined(GLM_SWIZZLE))
-		};
-#	elif(GLM_COMPONENT == GLM_COMPONENT_CXX98)
 		union {value_type x, r, s;};
 		union {value_type y, g, t;};
 		union {value_type z, b, p;};
@@ -81,15 +61,6 @@ namespace detail
 			GLM_SWIZZLE_GEN_REF_FROM_VEC4(T, P, detail::tvec4, detail::tref2, detail::tref3, detail::tref4)
 			GLM_SWIZZLE_GEN_VEC_FROM_VEC4(T, P, detail::tvec4, detail::tvec2, detail::tvec3, detail::tvec4)
 #		endif//(defined(GLM_SWIZZLE))
-#	else //(GLM_COMPONENT == GLM_COMPONENT_ONLY_XYZW)
-		value_type x, y, z, w;
-
-#		if(defined(GLM_SWIZZLE))
-			// Defines all he swizzle operator as functions
-			GLM_SWIZZLE_GEN_REF_FROM_VEC4_COMP(T, P, detail::tvec4, detail::tref2, detail::tref3, detail::tref4, x, y, z, w)
-			GLM_SWIZZLE_GEN_VEC_FROM_VEC4_COMP(T, P, detail::tvec4, detail::tvec2, detail::tvec3, detail::tvec4, x, y, z, w)
-#		endif//(defined(GLM_SWIZZLE))
-#	endif//GLM_COMPONENT
 
 		//////////////////////////////////////
 		// Accesses