diff --git a/source/vba/Util.cpp b/source/vba/Util.cpp
index 38d6c05..1f1a8b6 100644
--- a/source/vba/Util.cpp
+++ b/source/vba/Util.cpp
@@ -21,12 +21,6 @@
 #include <string.h>
 #include <zlib.h>
 
-#ifndef NO_PNG
-extern "C" {
-#include <png.h>
-}
-#endif
-
 #include "System.h"
 #include "NLS.h"
 #include "Util.h"
@@ -59,369 +53,6 @@ static int (*utilGzReadFunc)(gzFile, voidp, unsigned int) = NULL;
 static int (*utilGzCloseFunc)(gzFile) = NULL;
 static z_off_t (*utilGzSeekFunc)(gzFile, z_off_t, int) = NULL;
 
-bool utilWritePNGFile(const char *fileName, int w, int h, u8 *pix)
-{
-#ifndef NO_PNG
-  u8 writeBuffer[512 * 3];
-
-  FILE *fp = fopen(fileName,"wb");
-
-  if(!fp) {
-    systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), fileName);
-    return false;
-  }
-
-  png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-                                                NULL,
-                                                NULL,
-                                                NULL);
-  if(!png_ptr) {
-    fclose(fp);
-    return false;
-  }
-
-  png_infop info_ptr = png_create_info_struct(png_ptr);
-
-  if(!info_ptr) {
-    png_destroy_write_struct(&png_ptr,NULL);
-    fclose(fp);
-    return false;
-  }
-
-  if(setjmp(png_ptr->jmpbuf)) {
-    png_destroy_write_struct(&png_ptr,NULL);
-    fclose(fp);
-    return false;
-  }
-
-  png_init_io(png_ptr,fp);
-
-  png_set_IHDR(png_ptr,
-               info_ptr,
-               w,
-               h,
-               8,
-               PNG_COLOR_TYPE_RGB,
-               PNG_INTERLACE_NONE,
-               PNG_COMPRESSION_TYPE_DEFAULT,
-               PNG_FILTER_TYPE_DEFAULT);
-
-  png_write_info(png_ptr,info_ptr);
-
-  u8 *b = writeBuffer;
-
-  int sizeX = w;
-  int sizeY = h;
-
-  switch(systemColorDepth) {
-  case 16:
-    {
-      u16 *p = (u16 *)(pix+(w+2)*2); // skip first black line
-      for(int y = 0; y < sizeY; y++) {
-         for(int x = 0; x < sizeX; x++) {
-          u16 v = *p++;
-
-          *b++ = ((v >> systemRedShift) & 0x001f) << 3; // R
-          *b++ = ((v >> systemGreenShift) & 0x001f) << 3; // G
-          *b++ = ((v >> systemBlueShift) & 0x01f) << 3; // B
-        }
-        p++; // skip black pixel for filters
-        p++; // skip black pixel for filters
-        png_write_row(png_ptr,writeBuffer);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  case 24:
-    {
-      u8 *pixU8 = (u8 *)pix;
-      for(int y = 0; y < sizeY; y++) {
-        for(int x = 0; x < sizeX; x++) {
-          if(systemRedShift < systemBlueShift) {
-            *b++ = *pixU8++; // R
-            *b++ = *pixU8++; // G
-            *b++ = *pixU8++; // B
-          } else {
-            int blue = *pixU8++;
-            int green = *pixU8++;
-            int red = *pixU8++;
-
-            *b++ = red;
-            *b++ = green;
-            *b++ = blue;
-          }
-        }
-        png_write_row(png_ptr,writeBuffer);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  case 32:
-    {
-      u32 *pixU32 = (u32 *)(pix+4*(w+1));
-      for(int y = 0; y < sizeY; y++) {
-        for(int x = 0; x < sizeX; x++) {
-          u32 v = *pixU32++;
-
-          *b++ = ((v >> systemRedShift) & 0x001f) << 3; // R
-          *b++ = ((v >> systemGreenShift) & 0x001f) << 3; // G
-          *b++ = ((v >> systemBlueShift) & 0x001f) << 3; // B
-        }
-        pixU32++;
-
-        png_write_row(png_ptr,writeBuffer);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  }
-
-  png_write_end(png_ptr, info_ptr);
-
-  png_destroy_write_struct(&png_ptr, &info_ptr);
-
-  fclose(fp);
-
-  return true;
-#else
-  return false;
-#endif
-}
-
-void utilPutDword(u8 *p, u32 value)
-{
-  *p++ = value & 255;
-  *p++ = (value >> 8) & 255;
-  *p++ = (value >> 16) & 255;
-  *p = (value >> 24) & 255;
-}
-
-void utilPutWord(u8 *p, u16 value)
-{
-  *p++ = value & 255;
-  *p = (value >> 8) & 255;
-}
-
-bool utilWriteBMPFile(const char *fileName, int w, int h, u8 *pix)
-{
-  u8 writeBuffer[512 * 3];
-
-  FILE *fp = fopen(fileName,"wb");
-
-  if(!fp) {
-    systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), fileName);
-    return false;
-  }
-
-  struct {
-    u8 ident[2];
-    u8 filesize[4];
-    u8 reserved[4];
-    u8 dataoffset[4];
-    u8 headersize[4];
-    u8 width[4];
-    u8 height[4];
-    u8 planes[2];
-    u8 bitsperpixel[2];
-    u8 compression[4];
-    u8 datasize[4];
-    u8 hres[4];
-    u8 vres[4];
-    u8 colors[4];
-    u8 importantcolors[4];
-    //    u8 pad[2];
-  } bmpheader;
-  memset(&bmpheader, 0, sizeof(bmpheader));
-
-  bmpheader.ident[0] = 'B';
-  bmpheader.ident[1] = 'M';
-
-  u32 fsz = sizeof(bmpheader) + w*h*3;
-  utilPutDword(bmpheader.filesize, fsz);
-  utilPutDword(bmpheader.dataoffset, 0x36);
-  utilPutDword(bmpheader.headersize, 0x28);
-  utilPutDword(bmpheader.width, w);
-  utilPutDword(bmpheader.height, h);
-  utilPutDword(bmpheader.planes, 1);
-  utilPutDword(bmpheader.bitsperpixel, 24);
-  utilPutDword(bmpheader.datasize, 3*w*h);
-
-  fwrite(&bmpheader, 1, sizeof(bmpheader), fp);
-
-  u8 *b = writeBuffer;
-
-  int sizeX = w;
-  int sizeY = h;
-
-  switch(systemColorDepth) {
-  case 16:
-    {
-      u16 *p = (u16 *)(pix+(w+2)*(h)*2); // skip first black line
-      for(int y = 0; y < sizeY; y++) {
-        for(int x = 0; x < sizeX; x++) {
-          u16 v = *p++;
-
-          *b++ = ((v >> systemBlueShift) & 0x01f) << 3; // B
-          *b++ = ((v >> systemGreenShift) & 0x001f) << 3; // G
-          *b++ = ((v >> systemRedShift) & 0x001f) << 3; // R
-        }
-        p++; // skip black pixel for filters
-        p++; // skip black pixel for filters
-        p -= 2*(w+2);
-        fwrite(writeBuffer, 1, 3*w, fp);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  case 24:
-    {
-      u8 *pixU8 = (u8 *)pix+3*w*(h-1);
-      for(int y = 0; y < sizeY; y++) {
-        for(int x = 0; x < sizeX; x++) {
-          if(systemRedShift > systemBlueShift) {
-            *b++ = *pixU8++; // B
-            *b++ = *pixU8++; // G
-            *b++ = *pixU8++; // R
-          } else {
-            int red = *pixU8++;
-            int green = *pixU8++;
-            int blue = *pixU8++;
-
-            *b++ = blue;
-            *b++ = green;
-            *b++ = red;
-          }
-        }
-        pixU8 -= 2*3*w;
-        fwrite(writeBuffer, 1, 3*w, fp);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  case 32:
-    {
-      u32 *pixU32 = (u32 *)(pix+4*(w+1)*(h));
-      for(int y = 0; y < sizeY; y++) {
-        for(int x = 0; x < sizeX; x++) {
-          u32 v = *pixU32++;
-
-          *b++ = ((v >> systemBlueShift) & 0x001f) << 3; // B
-          *b++ = ((v >> systemGreenShift) & 0x001f) << 3; // G
-          *b++ = ((v >> systemRedShift) & 0x001f) << 3; // R
-        }
-        pixU32++;
-        pixU32 -= 2*(w+1);
-
-        fwrite(writeBuffer, 1, 3*w, fp);
-
-        b = writeBuffer;
-      }
-    }
-    break;
-  }
-
-  fclose(fp);
-
-  return true;
-}
-
-static int utilReadInt2(FILE *f)
-{
-  int res = 0;
-  int c = fgetc(f);
-  if(c == EOF)
-    return -1;
-  res = c;
-  c = fgetc(f);
-  if(c == EOF)
-    return -1;
-  return c + (res<<8);
-}
-
-static int utilReadInt3(FILE *f)
-{
-  int res = 0;
-  int c = fgetc(f);
-  if(c == EOF)
-    return -1;
-  res = c;
-  c = fgetc(f);
-  if(c == EOF)
-    return -1;
-  res = c + (res<<8);
-  c = fgetc(f);
-  if(c == EOF)
-    return -1;
-  return c + (res<<8);
-}
-
-void utilApplyIPS(const char *ips, u8 **r, int *s)
-{
-  // from the IPS spec at http://zerosoft.zophar.net/ips.htm
-  FILE *f = fopen(ips, "rb");
-  if(!f)
-    return;
-  u8 *rom = *r;
-  int size = *s;
-  if(fgetc(f) == 'P' &&
-     fgetc(f) == 'A' &&
-     fgetc(f) == 'T' &&
-     fgetc(f) == 'C' &&
-     fgetc(f) == 'H') {
-    int b;
-    int offset;
-    int len;
-    for(;;) {
-      // read offset
-      offset = utilReadInt3(f);
-      // if offset == EOF, end of patch
-      if(offset == 0x454f46)
-        break;
-      // read length
-      len = utilReadInt2(f);
-      if(!len) {
-        // len == 0, RLE block
-        len = utilReadInt2(f);
-        // byte to fill
-        int c = fgetc(f);
-        if(c == -1)
-          break;
-        b = (u8)c;
-      } else
-        b= -1;
-      // check if we need to reallocate our ROM
-      if((offset + len) >= size) {
-        size *= 2;
-        rom = (u8 *)realloc(rom, size);
-        *r = rom;
-        *s = size;
-      }
-      if(b == -1) {
-        // normal block, just read the data
-        if(fread(&rom[offset], 1, len, f) != (uint)len)
-          break;
-      } else {
-        // fill the region with the given byte
-        while(len--) {
-          rom[offset++] = b;
-        }
-      }
-    }
-  }
-  // close the file
-  fclose(f);
-}
-
-//TODO: Modify ZSNES code for this
-void utilApplyUPS(const char *ips, u8 **r, int *s)
-{
-}
-
 extern bool cpuIsMultiBoot;
 
 bool utilIsGBAImage(const char * file)
@@ -479,392 +110,19 @@ bool utilIsZipFile(const char *file)
 
   return false;
 }
-bool utilIsGzipFile(const char *file)
+
+void utilPutDword(u8 *p, u32 value)
 {
-  if(strlen(file) > 3) {
-    const char * p = strrchr(file,'.');
-
-    if(p != NULL) {
-      if(_stricmp(p, ".gz") == 0)
-        return true;
-      if(_stricmp(p, ".z") == 0)
-        return true;
-    }
-  }
-
-  return false;
+  *p++ = value & 255;
+  *p++ = (value >> 8) & 255;
+  *p++ = (value >> 16) & 255;
+  *p = (value >> 24) & 255;
 }
 
-// strip .gz or .z off end
-void utilStripDoubleExtension(const char *file, char *buffer)
+void utilPutWord(u8 *p, u16 value)
 {
-  if(buffer != file) // allows conversion in place
-    strcpy(buffer, file);
-
-  if(utilIsGzipFile(file)) {
-    char *p = strrchr(buffer, '.');
-
-    if(p)
-      *p = 0;
-  }
-}
-
-static bool utilIsImage(const char *file)
-{
-	return utilIsGBAImage(file) || utilIsGBImage(file);
-}
-
-
-IMAGE_TYPE utilFindType(const char *file)
-{
-  char buffer[2048];
-
-  if(utilIsZipFile(file))
-    {
-      unzFile unz = unzOpen(file);
-
-      if(unz == NULL)
-        {
-          systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), file);
-          return IMAGE_UNKNOWN;
-        }
-
-      int r = unzGoToFirstFile(unz);
-
-      if(r != UNZ_OK)
-
-        {
-          unzClose(unz);
-          systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
-          return IMAGE_UNKNOWN;
-
-        }
-
-      IMAGE_TYPE found = IMAGE_UNKNOWN;
-
-      unz_file_info info;
-
-      while(true)
-
-        {
-          r = unzGetCurrentFileInfo(unz,
-                                    &info,
-                                    buffer,
-                                    sizeof(buffer),
-                                    NULL,
-                                    0,
-                                    NULL,
-                                    0);
-
-          if(r != UNZ_OK)
-
-
-            {
-              unzClose(unz);
-              systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
-
-
-              return IMAGE_UNKNOWN;
-            }
-
-          if(utilIsGBAImage(buffer))
-            {
-              found = IMAGE_GBA;
-              break;
-            }
-
-          if(utilIsGBImage(buffer))
-            {
-              found = IMAGE_GB;
-              break;
-            }
-
-          r = unzGoToNextFile(unz);
-
-          if(r != UNZ_OK)
-            break;
-        }
-      unzClose(unz);
-
-      if(found == IMAGE_UNKNOWN)
-        {
-          systemMessage(MSG_NO_IMAGE_ON_ZIP,
-                        N_("No image found on ZIP file %s"), file);
-          return found;
-        }
-      return found;
-    }
-  else
-    {
-      if(utilIsGzipFile(file))
-        utilStripDoubleExtension(file, buffer);
-      else
-        strcpy(buffer, file);
-
-      if(utilIsGBAImage(buffer))
-        return IMAGE_GBA;
-      if(utilIsGBImage(buffer))
-        return IMAGE_GB;
-    }
-  return IMAGE_UNKNOWN;
-}
-
-int utilGetSize(int size)
-{
-  int res = 1;
-  while(res < size)
-    res <<= 1;
-  return res;
-}
-
-static u8 *utilLoadFromZip(const char *file,
-
-                           bool (*accept)(const char *),
-                           u8 *data,
-                           int &size)
-{
-
-  char buffer[2048];
-
-  unzFile unz = unzOpen(file);
-
-  if(unz == NULL)
-    {
-      systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), file);
-      return NULL;
-    }
-  int r = unzGoToFirstFile(unz);
-
-  if(r != UNZ_OK)
-    {
-      unzClose(unz);
-      systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
-      return NULL;
-    }
-
-  bool found = false;
-
-  unz_file_info info;
-
-  while(true)
-    {
-      r = unzGetCurrentFileInfo(unz,
-                                &info,
-                                buffer,
-                                sizeof(buffer),
-                                NULL,
-                                0,
-                                NULL,
-                                0);
-
-      if(r != UNZ_OK)
-        {
-          unzClose(unz);
-          systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
-          return NULL;
-        }
-
-      if(accept(buffer))
-        {
-          found = true;
-          break;
-        }
-
-      r = unzGoToNextFile(unz);
-
-      if(r != UNZ_OK)
-        break;
-    }
-
-  if(!found)
-    {
-      unzClose(unz);
-      systemMessage(MSG_NO_IMAGE_ON_ZIP,
-                    N_("No image found on ZIP file %s"), file);
-      return NULL;
-    }
-
-  int fileSize = info.uncompressed_size;
-  if(size == 0)
-    size = fileSize;
-  r = unzOpenCurrentFile(unz);
-
-  if(r != UNZ_OK)
-    {
-      unzClose(unz);
-      systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), buffer);
-      return NULL;
-    }
-
-  u8 *image = data;
-
-  if(image == NULL)
-    {
-      image = (u8 *)malloc(utilGetSize(size));
-      if(image == NULL)
-        {
-          unzCloseCurrentFile(unz);
-          unzClose(unz);
-          systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
-                        "data");
-          return NULL;
-        }
-      size = fileSize;
-    }
-  int read = fileSize <= size ? fileSize : size;
-  r = unzReadCurrentFile(unz,
-                         image,
-                         read);
-
-  unzCloseCurrentFile(unz);
-  unzClose(unz);
-
-  if(r != (int)read)
-    {
-      systemMessage(MSG_ERROR_READING_IMAGE,
-                    N_("Error reading image %s"), buffer);
-      if(data == NULL)
-        free(image);
-      return NULL;
-    }
-
-  size = fileSize;
-
-  return image;
-}
-
-static u8 *utilLoadGzipFile(const char *file,
-                            bool (*accept)(const char *),
-                            u8 *data,
-                            int &size)
-{
-  FILE* f = fopen(file, "rb");
-
-  if(f == NULL)
-    {
-      systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
-
-
-      return NULL;
-    }
-
-  fseek(f, -4, SEEK_END);
-  int fileSize = fgetc(f) | (fgetc(f) << 8) | (fgetc(f) << 16) | (fgetc(f) << 24);
-  fclose(f);
-
-
-  if(size == 0)
-    size = fileSize;
-
-  gzFile gz = gzopen(file, "rb");
-
-  if(gz == NULL)
-    {
-      // should not happen, but who knows?
-      systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
-      return NULL;
-    }
-
-  u8 *image = data;
-
-  if(image == NULL)
-    {
-      image = (u8 *)malloc(utilGetSize(size));
-      if(image == NULL)
-        {
-          systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
-                        "data");
-          fclose(f);
-          return NULL;
-        }
-      size = fileSize;
-    }
-  int read = fileSize <= size ? fileSize : size;
-  int r = gzread(gz, image, read);
-  gzclose(gz);
-
-  if(r != (int)read)
-    {
-      systemMessage(MSG_ERROR_READING_IMAGE,
-                    N_("Error reading image %s"), file);
-      if(data == NULL)
-        free(image);
-      return NULL;
-    }
-
-  size = fileSize;
-
-  return image;
-}
-
-u8 *utilLoad(const char *file,
-             bool (*accept)(const char *),
-             u8 *data,
-             int &size)
-{
-  if(utilIsZipFile(file))
-    {
-      return utilLoadFromZip(file, accept, data, size);
-    }
-  if(utilIsGzipFile(file))
-    {
-      return utilLoadGzipFile(file, accept, data, size);
-    }
-
-  u8 *image = data;
-
-  FILE* f = fopen(file, "rb");
-
-  if(!f)
-    {
-      systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
-      return NULL;
-    }
-
-  fseek(f,0,SEEK_END);
-  int fileSize = ftell(f);
-
-  fseek(f,0,SEEK_SET);
-  if(size == 0)
-    size = fileSize;
-
-  if(image == NULL)
-    {
-
-
-      image = (u8 *)malloc(utilGetSize(size));
-      if(image == NULL)
-        {
-
-
-          systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
-                        "data");
-          fclose(f);
-          return NULL;
-        }
-      size = fileSize;
-    }
-  int read = fileSize <= size ? fileSize : size;
-  int r = fread(image, 1, read, f);
-  fclose(f);
-
-  if(r != (int)read)
-    {
-
-
-
-
-
-      systemMessage(MSG_ERROR_READING_IMAGE,
-                    N_("Error reading image %s"), file);
-      if(data == NULL)
-        free(image);
-      return NULL;
-    }
-
-  size = fileSize;
-
-  return image;
+  *p++ = value & 255;
+  *p = (value >> 8) & 255;
 }
 
 void utilWriteInt(gzFile gzFile, int i)
@@ -946,76 +204,3 @@ long utilGzMemTell(gzFile file)
 {
   return memtell(file);
 }
-
-void utilGBAFindSave(const u8 *data, const int size)
-{
-  u32 *p = (u32 *)data;
-  u32 *end = (u32 *)(data + size);
-  int saveType = 0;
-  int flashSize = 0x10000;
-  bool rtcFound = false;
-
-  while(p  < end) {
-    u32 d = READ32LE(p);
-
-    if(d == 0x52504545) {
-      if(memcmp(p, "EEPROM_", 7) == 0) {
-        if(saveType == 0)
-          saveType = 3;
-      }
-    } else if (d == 0x4D415253) {
-      if(memcmp(p, "SRAM_", 5) == 0) {
-        if(saveType == 0)
-          saveType = 1;
-      }
-    } else if (d == 0x53414C46) {
-      if(memcmp(p, "FLASH1M_", 8) == 0) {
-        if(saveType == 0) {
-          saveType = 2;
-          flashSize = 0x20000;
-        }
-      } else if(memcmp(p, "FLASH", 5) == 0) {
-        if(saveType == 0) {
-          saveType = 2;
-          flashSize = 0x10000;
-        }
-      }
-    } else if (d == 0x52494953) {
-      if(memcmp(p, "SIIRTC_V", 8) == 0)
-        rtcFound = true;
-    }
-    p++;
-  }
-  // if no matches found, then set it to NONE
-  if(saveType == 0) {
-    saveType = 5;
-  }
-  rtcEnable(rtcFound);
-  cpuSaveType = saveType;
-  flashSetSize(flashSize);
-}
-
-void utilUpdateSystemColorMaps()
-{
-  switch(systemColorDepth) {
-  case 16:
-    {
-      for(int i = 0; i < 0x10000; i++) {
-        systemColorMap16[i] = ((i & 0x1f) << systemRedShift) |
-          (((i & 0x3e0) >> 5) << systemGreenShift) |
-          (((i & 0x7c00) >> 10) << systemBlueShift);
-      }
-    }
-    break;
-  case 24:
-  case 32:
-    {
-      for(int i = 0; i < 0x10000; i++) {
-        systemColorMap32[i] = ((i & 0x1f) << systemRedShift) |
-          (((i & 0x3e0) >> 5) << systemGreenShift) |
-          (((i & 0x7c00) >> 10) << systemBlueShift);
-      }
-    }
-    break;
-  }
-}
diff --git a/source/vba/Util.h b/source/vba/Util.h
index 0d462d3..2fe31f5 100644
--- a/source/vba/Util.h
+++ b/source/vba/Util.h
@@ -35,20 +35,9 @@ typedef struct {
   int size;
 } variable_desc;
 
-extern int utilGetSize(int size);
-extern bool utilWritePNGFile(const char *, int, int, u8 *);
-extern bool utilWriteBMPFile(const char *, int, int, u8 *);
-extern void utilApplyIPS(const char *ips, u8 **rom, int *size);
 extern bool utilIsGBAImage(const char *);
 extern bool utilIsGBImage(const char *);
-extern bool utilIsGzipFile(const char *);
 extern bool utilIsZipFile(const char *);
-extern void utilStripDoubleExtension(const char *, char *);
-extern IMAGE_TYPE utilFindType(const char *);
-extern u8 *utilLoad(const char *,
-                    bool (*)(const char*),
-                    u8 *,
-                    int &);
 
 extern void utilPutDword(u8 *, u32);
 extern void utilPutWord(u8 *, u16);
@@ -64,6 +53,4 @@ extern int utilGzRead(gzFile file, voidp buffer, unsigned int len);
 extern int utilGzClose(gzFile file);
 extern z_off_t utilGzSeek(gzFile file, z_off_t offset, int whence);
 extern long utilGzMemTell(gzFile file);
-extern void utilGBAFindSave(const u8 *, const int);
-extern void utilUpdateSystemColorMaps();
 #endif
diff --git a/source/vba/gb/GB.cpp b/source/vba/gb/GB.cpp
index cb064a0..5676fe5 100644
--- a/source/vba/gb/GB.cpp
+++ b/source/vba/gb/GB.cpp
@@ -2092,7 +2092,7 @@ void gbCPUInit(const char *biosFileName, bool useBiosFile)
   useBios = false;
   if (useBiosFile)
   {
-    int size = 0x100;
+/*    int size = 0x100;
     if(utilLoad(biosFileName,
                 CPUIsGBBios,
                 bios,
@@ -2101,7 +2101,7 @@ void gbCPUInit(const char *biosFileName, bool useBiosFile)
         useBios = true;
       else
         systemMessage(MSG_INVALID_BIOS_FILE_SIZE, N_("Invalid BOOTROM file size"));
-    }
+    }*/
   }
 }
 
@@ -3974,16 +3974,18 @@ bool gbReadSaveState(const char *name)
 
 bool gbWritePNGFile(const char *fileName)
 {
-  if(gbBorderOn)
+/*  if(gbBorderOn)
     return utilWritePNGFile(fileName, 256, 224, pix);
-  return utilWritePNGFile(fileName, 160, 144, pix);
+  return utilWritePNGFile(fileName, 160, 144, pix);*/
+	return false;
 }
 
 bool gbWriteBMPFile(const char *fileName)
 {
-  if(gbBorderOn)
+/*  if(gbBorderOn)
     return utilWriteBMPFile(fileName, 256, 224, pix);
-  return utilWriteBMPFile(fileName, 160, 144, pix);
+  return utilWriteBMPFile(fileName, 160, 144, pix);*/
+	return false;
 }
 
 void gbCleanUp()
@@ -4048,10 +4050,10 @@ bool gbLoadRom(const char *szFile)
 
   systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
 
-  gbRom = utilLoad(szFile,
+/*  gbRom = utilLoad(szFile,
                    utilIsGBImage,
                    NULL,
-                   size);
+                   size);*/
   if(!gbRom)
     return false;
 
diff --git a/source/vba/gba/GBA.cpp b/source/vba/gba/GBA.cpp
index 1cb0afc..451e3ee 100644
--- a/source/vba/gba/GBA.cpp
+++ b/source/vba/gba/GBA.cpp
@@ -1130,12 +1130,12 @@ bool CPUReadBatteryFile(const char *fileName)
 
 bool CPUWritePNGFile(const char *fileName)
 {
-  return utilWritePNGFile(fileName, 240, 160, pix);
+  return false; //utilWritePNGFile(fileName, 240, 160, pix);
 }
 
 bool CPUWriteBMPFile(const char *fileName)
 {
-  return utilWriteBMPFile(fileName, 240, 160, pix);
+  return false; //utilWriteBMPFile(fileName, 240, 160, pix);
 }
 
 bool CPUIsZipFile(const char * file)
@@ -1296,7 +1296,7 @@ int CPULoadRom(const char *szFile)
     return 0;
   }
 
-  u8 *whereToLoad = cpuIsMultiBoot ? workRAM : rom;
+  //u8 *whereToLoad = cpuIsMultiBoot ? workRAM : rom;
 
 #ifndef NO_DEBUGGER
   if(CPUIsELF(szFile)) {
@@ -1321,7 +1321,7 @@ int CPULoadRom(const char *szFile)
     }
   } else
 #endif //NO_DEBUGGER
-  if(!utilLoad(szFile,
+/*  if(!utilLoad(szFile,
                       utilIsGBAImage,
                       whereToLoad,
                       romSize)) {
@@ -1337,7 +1337,7 @@ int CPULoadRom(const char *szFile)
   for(i = (romSize+1)&~1; i < 0x2000000; i+=2) {
     WRITE16LE(temp, (i >> 1) & 0xFFFF);
     temp++;
-  }
+  }*/
 
   bios = (u8 *)calloc(1,0x4000);
   if(bios == NULL) {
@@ -2969,7 +2969,7 @@ void CPUInit(const char *biosFileName, bool useBiosFile)
   saveType = 0;
   useBios = false;
 
-  if(useBiosFile) {
+/*  if(useBiosFile) {
     int size = 0x4000;
     if(utilLoad(biosFileName,
                 CPUIsGBABios,
@@ -2980,7 +2980,7 @@ void CPUInit(const char *biosFileName, bool useBiosFile)
       else
         systemMessage(MSG_INVALID_BIOS_FILE_SIZE, N_("Invalid BIOS file size"));
     }
-  }
+  }*/
 
   if(!useBios) {
     memcpy(bios, myROM, sizeof(myROM));