--- a/src/hugin1/hugin/PreferencesDialog.cpp
+++ b/src/hugin1/hugin/PreferencesDialog.cpp
@@ -28,24 +28,6 @@
 #include "panoinc_WX.h"
 #include "wx/listbook.h"
 #include "panoinc.h"
-
-#ifdef HAVE_PANO12_QUERYFEATURE_H
-#ifndef WIN32
-#include <dlfcn.h>
-#else
-#include <windows.h>
-#endif
-
-extern "C" {
-#ifdef HasPANO13
-#include <pano13/version.h>
-#include <pano13/queryfeature.h>
-#else
-#include <pano12/version.h>
-#include <pano12/queryfeature.h>
-#endif
-}
-#endif
 
 #include "common/wxPlatform.h"
 
@@ -404,175 +386,7 @@
 
 bool PreferencesDialog::GetPanoVersion()
 {
-
-#ifdef HAVE_PANO12_QUERYFEATURE_H
-#ifdef __WXMSW__
-	HINSTANCE		hDll		= NULL;
-#elif (!defined __WXMAC__)
-	void *hDll = NULL;
-#endif
-	PROC_QF			pfQF		= NULL;
-	PROC_QFNUM		pfQFNum		= NULL;
-	PROC_QFINT		pfQFInt		= NULL;
-	PROC_QFDOUBLE	pfQFDouble	= NULL;
-	PROC_QFSTRING	pfQFString	= NULL;
-
-	int				iResult;
-	double			dResult;
-	char			sResult[256];
-	char			str1[1000];
-	char			str2[10000];
-	bool			bSuccess = true;
-
-#ifdef __WXMSW__
-	hDll = LoadLibrary(_T("pano13.dll"));
-	if(!hDll)
-	{
-		//MessageBox((HWND)NULL, _("Could not load dll"), _("panoinfo"), MB_ICONEXCLAMATION);
-		bSuccess = false;
-		goto cleanup;
-	}
-
-	pfQF		= (PROC_QF) GetProcAddress( hDll, "queryFeatures" );
-	pfQFNum		= (PROC_QFNUM) GetProcAddress( hDll, "queryFeatureCount" );
-	pfQFInt     = (PROC_QFINT) GetProcAddress( hDll, "queryFeatureInt" );
-	pfQFDouble  = (PROC_QFDOUBLE) GetProcAddress( hDll, "queryFeatureDouble" );
-	pfQFString  = (PROC_QFSTRING) GetProcAddress( hDll, "queryFeatureString" );
-#elif (defined __WXMAC__)
-//HuginOSX has libpano12 statically linked; hard code the query functions instead
-	pfQF		= (PROC_QF) queryFeatures;
-	pfQFNum		= (PROC_QFNUM) queryFeatureCount;
-	pfQFInt     = (PROC_QFINT) queryFeatureInt;
-	pfQFDouble  = (PROC_QFDOUBLE) queryFeatureDouble;
-	pfQFString  = (PROC_QFSTRING) queryFeatureString;
-#else
-	hDll = dlopen("libpano13.so.0", RTLD_NOW);
-	if(!hDll)
-	{
-		hDll = dlopen("libpano13.so", RTLD_NOW);
-		if(!hDll)
-		{
-		  printf("Could not load pano13");
-		  bSuccess = false;
-		  goto cleanup;
-		}
-	}
-
-	pfQF		= (PROC_QF) dlsym( hDll, "queryFeatures" );
-	pfQFNum		= (PROC_QFNUM) dlsym( hDll, "queryFeatureCount" );
-	pfQFInt     = (PROC_QFINT) dlsym( hDll, "queryFeatureInt" );
-	pfQFDouble  = (PROC_QFDOUBLE) dlsym( hDll, "queryFeatureDouble" );
-	pfQFString  = (PROC_QFSTRING) dlsym( hDll, "queryFeatureString" );
-#endif
-	str2[0] = '\0';
-	if(!pfQF)
-	{
-		strcat(str2 ,"Error: The 'queryFeatures' function not present\n");
-	}
-	if(!pfQFNum)
-	{
-		strcat(str2 ,"Error: The 'queryFeatureCount' function not present\n");
-	}
-	if(!pfQFString)
-	{
-		strcat(str2 ,"Error: The 'queryFeatureString' function not present\n");
-	}
-	if(!pfQFInt)
-	{
-		strcat(str2 ,"Error: The 'queryFeatureInt' function not present\n");
-	}
-	if(!pfQFDouble)
-	{
-		strcat(str2 ,"Error: The 'queryFeatureDouble' function not present\n");
-	}
-
-
-	if(pfQFString)
-	{
-		if((pfQFString) (PTVERSION_NAME_FILEVERSION, sResult, sizeof(sResult)/sizeof(sResult[0]) ))
-		{
-			m_PTVersion = wxString(sResult, wxConvLocal);
-		}
-
-		if((pfQFString) (PTVERSION_NAME_COMMENT, sResult, sizeof(sResult)/sizeof(sResult[0]) ))
-		{
-			sprintf(str1, "Comment:\t%s\n", sResult );
-			strcat(str2 ,str1);
-		}
-
-		if((pfQFString) (PTVERSION_NAME_LEGALCOPYRIGHT, sResult, sizeof(sResult)/sizeof(sResult[0]) ))
-		{
-			sprintf(str1, "Copyright:\t%s\n\n", sResult );
-			strcat(str2 ,str1);
-		}
-
-	}
-
-	if(pfQFInt)
-	{
-		if((pfQFInt) ("CPErrorIsDistSphere", &iResult ))
-		{
-			sprintf(str1, "Optimizer Error:\t%s\n", iResult? "dist sphere" : "dist rect" );
-			strcat(str2 ,str1);
-		}
-	}
-
-	if(pfQFDouble)
-	{
-		if((pfQFDouble) ("MaxFFOV", &dResult ))
-		{
-			sprintf(str1, "Max FoV:\t\t%f\n\n", dResult );
-			strcat(str2 ,str1);
-		}
-
-	}
-
-	if(pfQFNum && pfQF && pfQFString)
-	{
-		int i,bufsize,numfeatures;
-		char *name;
-		char *value;
-		Tp12FeatureType type;
-
-		strcat(str2 ,"Feature List:\n\n");
-
-		numfeatures = pfQFNum();
-		for(i=0; i < numfeatures;i++)
-		{
-			pfQF(i, &name, &type);
-			bufsize = pfQFString(name, NULL, 0)+1;
-			value = (char*)malloc(bufsize);
-			pfQFString(name, value, bufsize);
-
-			sprintf(str1, "   %s: %s\n", name, value);
-			strcat(str2 ,str1);
-
-			free(value);
-		}
-	}
-	// use wxConvLocal to deal with the copyright symbols used by panotools
-	m_PTDetails = wxString(str2, wxConvLocal);
-
-#ifndef __WXMAC__
-cleanup:
-#endif
-
-  if (bSuccess)
-  {
-#ifdef __WXMSW__
-	FreeLibrary(hDll);
-#elif defined __WXMAC__
-//nothing to do
-#else
-	dlclose(hDll);
-#endif
-	return true;
-  } else {
-	return false;
-  }
-#else // HAVE_PANO12_QUERYFEATURE_H
   return false;
-#endif
 }
 
 void PreferencesDialog::UpdateDisplayData(int panel)