diff --git a/pcbnew/drc/drc_test_provider_copper_clearance.cpp b/pcbnew/drc/drc_test_provider_copper_clearance.cpp
index 630c9461b5..1cd9193768 100644
--- a/pcbnew/drc/drc_test_provider_copper_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_copper_clearance.cpp
@@ -509,9 +509,8 @@ bool DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadAgainstItem( PAD* pad, SHAPE* pa
         if( fp->IsNetTie() && ( other->Type() == PCB_FP_SHAPE_T || other->Type() == PCB_PAD_T ) )
             testClearance = false;
 
-        // CADSTAR implements thermal vias using pads insteads of vias
-        if( fp->AllowThermalPads() && other->Type() == PCB_PAD_T )
-            testHoles = false;
+        // No hole testing within a footprint
+        testHoles = false;
     }
 
     if( pad->GetAttribute() == PAD_ATTRIB_NPTH && !pad->FlashLayer( layer ) )
diff --git a/pcbnew/footprint.h b/pcbnew/footprint.h
index 3414b008fe..8bfa14b927 100644
--- a/pcbnew/footprint.h
+++ b/pcbnew/footprint.h
@@ -241,12 +241,6 @@ public:
         return GetKeywords().StartsWith( wxT( "net tie" ) );
     }
 
-    // Might as well keep all the hacks in the same place....
-    bool AllowThermalPads() const
-    {
-        return GetKeywords().StartsWith( wxT( "allow thermal pads" ) );
-    }
-
     void Move( const wxPoint& aMoveVector ) override;
 
     void Rotate( const wxPoint& aRotCentre, double aAngle ) override;
diff --git a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
index 1e8cd07d9d..1282448a8b 100644
--- a/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
+++ b/pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
@@ -655,7 +655,6 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadComponentLibrary()
                                               wxT( "" ) );
         FOOTPRINT* footprint = new FOOTPRINT( m_board );
         footprint->SetPosition( getKiCadPoint( component.Origin ) );
-        footprint->SetKeywords( wxT( "allow thermal pads" ) );
 
         LIB_ID libID;
         libID.Parse( fpName, true );