diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp
index 6dc68c121..9054cde28 100644
--- a/internal/c/libqb.cpp
+++ b/internal/c/libqb.cpp
@@ -12634,18 +12634,11 @@ void qbs_print(qbs* str,int32 finish_on_new_line){
 
 }
 
-
-int32 qbs_cleanup(uint32 base,int32 passvalue){
-  while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
-  return passvalue;
+template <typename T> static T qbs_cleanup(uint32 base,T passvalue){ 
+      while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
+            return passvalue;
 }
 
-long double qbs_cleanup(uint32 base,long double passvalue){
-  while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
-  return passvalue;
-}
-
-
 void qbg_sub_window(float x1,float y1,float x2,float y2,int32 passed){
   //                  &1
   //(passed&2)->SCREEN
diff --git a/internal/c/qbx.cpp b/internal/c/qbx.cpp
index 8e6ab47e9..52414ab42 100644
--- a/internal/c/qbx.cpp
+++ b/internal/c/qbx.cpp
@@ -393,8 +393,6 @@ extern void lprint_makefit(qbs *text);
 extern void tab();
 extern void qbs_print(qbs* str,int32 finish_on_new_line);
 extern void qbs_lprint(qbs* str,int32 finish_on_new_line);
-extern long double qbs_cleanup(uint32 base,long double passvalue);
-extern int32 qbs_cleanup(uint32 base,int32 passvalue);
 extern void qbg_sub_window(float x1,float y1,float x2,float y2,int32 passed);
 extern void qbg_sub_view_print(int32 topline,int32 bottomline,int32 passed);
 extern void qbg_sub_view(int32 x1,int32 y1,int32 x2,int32 y2,int32 fillcolor,int32 bordercolor,int32 passed);
@@ -781,6 +779,11 @@ c=*a8;
 *b8++=c;
 }
 }
+extern ptrszint *qbs_tmp_list;
+template <typename T> static T qbs_cleanup(uint32 base,T passvalue){ 
+      while (qbs_tmp_list_nexti>base) { qbs_tmp_list_nexti--; if(qbs_tmp_list[qbs_tmp_list_nexti]!=-1)qbs_free((qbs*)qbs_tmp_list[qbs_tmp_list_nexti]); }//clear any temp. strings created
+            return passvalue;
+}
 
 //CSNG
 inline double func_csng_float(long double value){
diff --git a/source/global/version.bas b/source/global/version.bas
index 46a9ec984..f5d34be43 100644
--- a/source/global/version.bas
+++ b/source/global/version.bas
@@ -3,5 +3,5 @@ DIM SHARED BuildNum AS STRING
 Version$ = "1.000"
 'BuildNum format is YYYYMMDD/id, where id is a ever-increasing
 'integer. If you make a change, update the date and increase the id!
-BuildNum$ = "20160802/39"
+BuildNum$ = "20160803/40"