diff --git a/include/etl/optional.h b/include/etl/optional.h
index c037802d6..d85763d25 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -1096,38 +1096,17 @@ namespace etl
       dummy_t dummy;
       T       value;
 
-      constexpr storage_type()
+      ETL_CONSTEXPR storage_type()
         : dummy()
       {
       }
 
-      constexpr storage_type(const T& v)
+      ETL_CONSTEXPR storage_type(const T& v)
         : value(v) 
       {
       }
     };
 
-
-    //struct storage_type
-    //{
-    //  storage_type()
-    //  {
-    //  }
-
-    //  union union_type
-    //  {
-    //    union_type()
-    //      : dummy(0)
-    //    {
-    //    }
-
-    //    char dummy;
-    //    T value;
-    //  };
-
-    //  union_type u;
-    //};
-
     storage_type storage;
   };