diff --git a/TODO b/TODO
index 797d6005..f2de0060 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,3 @@
-- windows >4gb tests
-
-  does it read a 4gb file OK?
-
-  try writing one and read it on linux
-
-  carry the 1tb external drive over
-
 WONTFIX for 7.20
 ================
 
diff --git a/libvips/iofuncs/im_mapfile.c b/libvips/iofuncs/im_mapfile.c
index 00d334af..5a2bc852 100644
--- a/libvips/iofuncs/im_mapfile.c
+++ b/libvips/iofuncs/im_mapfile.c
@@ -110,10 +110,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
 	printf( "im__mmap: length = 0x%zx, offset = 0x%lx\n", length, offset );
 #endif /*DEBUG*/
 
-	printf( "** start\n" );
-	printf( "length = 0x%zx\n", length );
-	printf( "offset = 0x%lx\n", (guint64) offset );
-
 #ifdef OS_WIN32
 {
 	HANDLE hFile = (HANDLE) _get_osfhandle( fd );
@@ -140,12 +136,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
 	dwFileOffsetLow = quad.LowPart;
 	dwFileOffsetHigh = quad.HighPart;
 
-	printf( "flProtect = 0x%x\n", flProtect );
-	printf( "flProtect = 0x%x\n", flProtect );
-	printf( "dwDesiredAccess = 0x%x\n", dwDesiredAccess );
-	printf( "dwFileOffsetHigh = 0x%x\n", dwFileOffsetHigh );
-	printf( "dwFileOffsetLow = 0x%x\n", dwFileOffsetLow );
-
         if( !(hMMFile = CreateFileMapping( hFile,
 		NULL, flProtect, 0, 0, NULL )) ) {
                 im_error_system( GetLastError(), "im_mapfile", 
@@ -195,8 +185,6 @@ im__mmap( int fd, int writeable, size_t length, gint64 offset )
 }
 #endif /*OS_WIN32*/
 
-	printf( "** success\n" );
-
 	return( baseaddr );
 }
 
diff --git a/libvips/iofuncs/window.c b/libvips/iofuncs/window.c
index b2bfc556..eb036774 100644
--- a/libvips/iofuncs/window.c
+++ b/libvips/iofuncs/window.c
@@ -225,14 +225,10 @@ im_window_set( im_window_t *window, int top, int height )
 		(gint64) IM_IMAGE_SIZEOF_LINE( window->im ) * top;
 	length = (size_t) IM_IMAGE_SIZEOF_LINE( window->im ) * height;
 
-	printf( "start = 0x%lx\n", (guint64) start );
-
 	pagestart = start - start % pagesize;
 	end = start + length;
 	pagelength = end - pagestart;
 
-	printf( "pagestart = 0x%lx\n", (guint64) pagestart );
-
 	/* Make sure we have enough file.
 	 */
 	if( end > window->im->file_length ) {