diff --git a/Tensile/Source/lib/include/Tensile/ContractionProblem.hpp b/Tensile/Source/lib/include/Tensile/ContractionProblem.hpp
index 87524ac7d..83aa72f55 100644
--- a/Tensile/Source/lib/include/Tensile/ContractionProblem.hpp
+++ b/Tensile/Source/lib/include/Tensile/ContractionProblem.hpp
@@ -233,8 +233,8 @@ namespace Tensile
 
     struct TENSILE_API ContractionInputs: public ProblemInputs
     {
-        HIPCC_BUILD ContractionInputs();
-        virtual HIPCC_BUILD ~ContractionInputs();
+        ContractionInputs();
+        virtual ~ContractionInputs();
     };
 
     template <typename A, typename B, typename C, typename D, typename Alpha, typename Beta>
@@ -247,10 +247,10 @@ namespace Tensile
         using AlphaType = Alpha;
         using BetaType = Beta;
 
-        HIPCC_BUILD TypedContractionInputs();
-        HIPCC_BUILD TypedContractionInputs(A const* _a, B const* _b, C const* _c, D * _d,
+        TypedContractionInputs();
+        TypedContractionInputs(A const* _a, B const* _b, C const* _c, D * _d,
                                Alpha _alpha, Beta _beta);
-        HIPCC_BUILD ~TypedContractionInputs();
+        ~TypedContractionInputs();
         
         A const* a = nullptr;
         B const* b = nullptr;
diff --git a/Tensile/Source/lib/include/Tensile/Macros.hpp b/Tensile/Source/lib/include/Tensile/Macros.hpp
index 781627745..7c1350e88 100644
--- a/Tensile/Source/lib/include/Tensile/Macros.hpp
+++ b/Tensile/Source/lib/include/Tensile/Macros.hpp
@@ -31,9 +31,3 @@
 #else
 #define TENSILE_API __attribute__ ((visibility("default")))
 #endif
-
-#ifdef __HIPCC__
-#define HIPCC_BUILD __host__ __device__
-#else
-#define HIPCC_BUILD
-#endif
diff --git a/Tensile/Source/lib/include/Tensile/Tensile.hpp b/Tensile/Source/lib/include/Tensile/Tensile.hpp
index 365c0bacb..9795daf09 100644
--- a/Tensile/Source/lib/include/Tensile/Tensile.hpp
+++ b/Tensile/Source/lib/include/Tensile/Tensile.hpp
@@ -52,7 +52,7 @@ namespace Tensile
     class TENSILE_API ProblemInputs
     {
     public:
-        virtual HIPCC_BUILD ~ProblemInputs();
+        virtual ~ProblemInputs();
 
     };
 
diff --git a/Tensile/Source/lib/source/ContractionProblem.cpp b/Tensile/Source/lib/source/ContractionProblem.cpp
index fa6261f6f..7191d1d44 100644
--- a/Tensile/Source/lib/source/ContractionProblem.cpp
+++ b/Tensile/Source/lib/source/ContractionProblem.cpp
@@ -855,18 +855,18 @@ namespace Tensile
         return stream >> bound.a >> comma >> bound.b;
     }
 
-    TENSILE_API HIPCC_BUILD ProblemInputs::~ProblemInputs() = default;
-    HIPCC_BUILD ContractionInputs::ContractionInputs() = default;
-    HIPCC_BUILD ContractionInputs::~ContractionInputs() = default;
+    TENSILE_API ProblemInputs::~ProblemInputs() = default;
+    ContractionInputs::ContractionInputs() = default;
+    ContractionInputs::~ContractionInputs() = default;
 
     template <typename A, typename B, typename C, typename D, typename Alpha, typename Beta>
-    HIPCC_BUILD TypedContractionInputs<A, B, C, D, Alpha, Beta>::TypedContractionInputs() = default;
+    TypedContractionInputs<A, B, C, D, Alpha, Beta>::TypedContractionInputs() = default;
 
     template <typename A, typename B, typename C, typename D, typename Alpha, typename Beta>
-    HIPCC_BUILD TypedContractionInputs<A, B, C, D, Alpha, Beta>::~TypedContractionInputs() = default; 
+    TypedContractionInputs<A, B, C, D, Alpha, Beta>::~TypedContractionInputs() = default; 
 
     template <typename A, typename B, typename C, typename D, typename Alpha, typename Beta>
-    HIPCC_BUILD TypedContractionInputs<A, B, C, D, Alpha, Beta>::TypedContractionInputs(
+    TypedContractionInputs<A, B, C, D, Alpha, Beta>::TypedContractionInputs(
             A const* _a, B const* _b, C const* _c, D * _d,
             Alpha _alpha, Beta _beta)
         : a(_a), b(_b), c(_c), d(_d), alpha(_alpha), beta(_beta)