diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index bbc26ba6..174bc5f6 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -82,10 +82,7 @@ BEGIN
      'TQ_UINT64' => '$',
      'TQ_INT64' => '$',
      'TQ_LLONG' => '$',
-     'tquint64' => '$',
-     'qint64' => '$',
      'long long' => '$',
-     'qulonglong' => '$',
 );
 
 # Yes some of this is in kalyptusDataDict's ctypemap
@@ -147,21 +144,13 @@ BEGIN
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
    'TQ_INT16' => 'short',
-   'qint16' => 'short',
    'TQ_INT32' => 'int',
-   'qint32' => 'int',
-   'qint32&' => 'int&',
    'TQ_INT8' => 'char',
-   'qint8' => 'char',
    'TQ_LONG' => 'long',
    'TQ_UINT16' => 'ushort',
-   'tquint16' => 'ushort',
    'TQ_UINT32' => 'uint',
-   'tquint32' => 'uint',
    'TQ_UINT8' => 'uchar',
-   'tquint8' => 'uchar',
    'TQ_ULONG' => 'long',
-   'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 27d9f5f8..3ea44e58 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -75,10 +75,7 @@ BEGIN
      'TQ_UINT64' => '$',
      'TQ_INT64' => '$',
      'TQ_LLONG' => '$',
-     'tquint64' => '$',
-     'qint64' => '$',
      'long long' => '$',
-     'qulonglong' => '$',
 );
 
 # Yes some of this is in kalyptusDataDict's ctypemap
@@ -141,21 +138,13 @@ BEGIN
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
    'TQ_INT16' => 'short',
-   'qint16' => 'short',
    'TQ_INT32' => 'int',
-   'qint32' => 'int',
-   'qint32&' => 'int&',
    'TQ_INT8' => 'char',
-   'qint8' => 'char',
    'TQ_LONG' => 'long',
    'TQ_UINT16' => 'ushort',
-   'tquint16' => 'ushort',
    'TQ_UINT32' => 'uint',
-   'tquint32' => 'uint',
    'TQ_UINT8' => 'uchar',
-   'tquint8' => 'uchar',
    'TQ_ULONG' => 'long',
-   'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',