Index: trunk/glueforge/templates/psdb/code.tt
===================================================================
--- trunk/glueforge/templates/psdb/code.tt	(revision 9414)
+++ trunk/glueforge/templates/psdb/code.tt	(revision 9419)
@@ -31,8 +31,6 @@
 #include "[% pkg_name %].h"
 
-#define [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME "position"
 [% FOREACH table = tables -%]
 #define [% table.namespace FILTER upper %]_TABLE_NAME "[% table.name %]"
-#define [% table.namespace FILTER upper %]_INDEX_NAME [% pkg_name FILTER upper %]_DEFAULT_INDEX_NAME
 [% END -%]
 #define MAX_STRING_LENGTH 1024
@@ -50,10 +48,7 @@
 [% INCLUDE insert.tt %]
 [% INCLUDE delete.tt -%]
-[% INCLUDE pop.tt %]
 [% INCLUDE insertobject.tt %]
 [% INCLUDE insertobjects.tt %]
-[% INCLUDE popobject.tt %]
 [% INCLUDE insertfits.tt %]
-[% INCLUDE popfits.tt %]
 [% INCLUDE selectrowsfits.tt %]
 [% INCLUDE metadatafromobject.tt %]