Remove Table Builder classes