diff --git a/.gitattributes b/.gitattributes
index 29ffba4ad96..9e8363a54a9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1330,7 +1330,6 @@ src/mame/drivers/champbwl.c svneol=native#text/plain
 src/mame/drivers/chanbara.c svneol=native#text/plain
 src/mame/drivers/changela.c svneol=native#text/plain
 src/mame/drivers/cheekyms.c svneol=native#text/plain
-src/mame/drivers/cherrym.c svneol=native#text/plain
 src/mame/drivers/cherrym2.c svneol=native#text/plain
 src/mame/drivers/chinagat.c svneol=native#text/plain
 src/mame/drivers/chinsan.c svneol=native#text/plain
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
deleted file mode 100644
index 3b13b8b536e..00000000000
--- a/src/mame/drivers/cherrym.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-
-Driver by Curt Coder
-
-*/
-
-#include "driver.h"
-#include "sound/ay8910.h"
-
-/*static UINT8 *nvram;
-static size_t nvram_size;*/
-
-/* video */
-
-static tilemap *bg_tilemap;
-
-static PALETTE_INIT( cm )
-{
-	int i;
-
-	for ( i = 0; i < machine->config->total_colors; i++ )
-	{
-		int bit0,bit1,bit2,bit3,r,g,b;
-
-		// red component
-		bit0 = (color_prom[0] >> 3) & 0x01;
-		bit1 = (color_prom[0] >> 2) & 0x01;
-		bit2 = (color_prom[0] >> 1) & 0x01;
-		bit3 = (color_prom[0] >> 0) & 0x01;
-		r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
-
-		// green component
-		bit0 = (color_prom[machine->config->total_colors] >> 3) & 0x01;
-		bit1 = (color_prom[machine->config->total_colors] >> 2) & 0x01;
-		bit2 = (color_prom[machine->config->total_colors] >> 1) & 0x01;
-		bit3 = (color_prom[machine->config->total_colors] >> 0) & 0x01;
-		g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
-
-		// blue component
-		bit0 = (color_prom[2*machine->config->total_colors] >> 3) & 0x01;
-		bit1 = (color_prom[2*machine->config->total_colors] >> 2) & 0x01;
-		bit2 = (color_prom[2*machine->config->total_colors] >> 1) & 0x01;
-		bit3 = (color_prom[2*machine->config->total_colors] >> 0) & 0x01;
-		b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
-
-		palette_set_color(machine,i,MAKE_RGB(r,g,b));
-
-		color_prom++;
-	}
-}
-
-static WRITE8_HANDLER( cm_videoram_w )
-{
-	videoram[offset] = data;
-	tilemap_mark_tile_dirty(bg_tilemap, offset);
-}
-
-static WRITE8_HANDLER( cm_colorram_w )
-{
-	colorram[offset] = data;
-	tilemap_mark_tile_dirty(bg_tilemap, offset);
-}
-
-static TILE_GET_INFO( get_bg_tile_info )
-{
-	int attr = colorram[tile_index];
-	int code = videoram[tile_index] + ((attr & 0x0f) << 8);
-	int color = (attr & 0xf0) >> 4;
-
-	SET_TILE_INFO(0, code, color, 0);
-}
-
-#if 0
-static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
-{
-	// THIS IS COMPLETELY WRONG AND ONLY A PLACEHOLDER, IT HAS BEEN DISABLED TO KEEP THE COMPILER HAPPY
-	int offs;
-
-	for (offs = 0; offs < spriteram_size; offs += 4)
-	{
-		if (spriteram[offs + 3])
-		{
-			int attr = spriteram[offs + 1];
-			int code = spriteram[offs+0] + ((attr & 0x40) << 2);
-			int color = attr & 0x0f;
-			int sx = spriteram[offs + 2] - 2 * (attr & 0x80);
-			int sy = spriteram[offs + 3];
-			int flipx = attr & 0x10;
-			int flipy = attr & 0x20;
-
-			drawgfx(bitmap, machine->gfx[1], code, color, flipx, flipy, sx, sy,
-				cliprect, TRANSPARENCY_PEN, 0);
-		}
-	}
-}
-#endif
-
-static VIDEO_START(cm)
-{
-	bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows,
-		8, 8, 64, 32);
-}
-
-static VIDEO_UPDATE(cm)
-{
-	tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
-//  draw_sprites(screen->machine, bitmap, cliprect);
-	return 0;
-}
-
-#if 0// For when NVRAM is hooked up
-static NVRAM_HANDLER( cm )
-{
-	if (read_or_write)
-	{
-		mame_fwrite(file, nvram, nvram_size);
-	}
-	else
-	{
-		if (file)
-		{
-			mame_fread(file, nvram, nvram_size);
-		}
-		else
-		{
-			memset(nvram, 0xff, nvram_size);
-		}
-	}
-}
-#endif
-
-static ADDRESS_MAP_START( cm_map, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x0000, 0xbfff) AM_ROM AM_WRITENOP
-	AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)// is it here?
-	AM_RANGE(0xd800, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(cm_videoram_w) AM_BASE(&videoram)
-	AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(cm_colorram_w) AM_BASE(&colorram)
-	AM_RANGE(0xf000, 0xffff) AM_RAM
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
-	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_READ_PORT("PLAYER")
-	AM_RANGE(0x05, 0x05) AM_READ_PORT("COIN")
-	AM_RANGE(0x06, 0x06) AM_READ_PORT("TEST")
-	AM_RANGE(0x07, 0x07) AM_WRITENOP
-	AM_RANGE(0x08, 0x08) AM_READ_PORT("DSW1")
-	AM_RANGE(0x09, 0x09) AM_READ_PORT("DSW2")
-	AM_RANGE(0x0a, 0x0a) AM_READ_PORT("DSW3")
-	AM_RANGE(0x0b, 0x0b) AM_WRITENOP
-	AM_RANGE(0x10, 0x10) AM_WRITENOP
-	AM_RANGE(0x11, 0x11) AM_WRITENOP
-	AM_RANGE(0x12, 0x12) AM_WRITENOP
-	AM_RANGE(0x13, 0x13) AM_WRITENOP
-ADDRESS_MAP_END
-
-static INPUT_PORTS_START( cmv801 )
-	PORT_START("PLAYER")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Q)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_W)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Big")
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Double Up")
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Stop / Take Score")
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Bet")
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Small")
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
-
-	PORT_START("COIN")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_A)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_S)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 3") PORT_CODE(KEYCODE_F)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) // PORT_NAME("Bit 4") PORT_CODE(KEYCODE_G)
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN4 ) // PORT_NAME("Bit 5") PORT_CODE(KEYCODE_H)
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )		// Key-In
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )		// 10 Credits
-
-	PORT_START("TEST")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 0") PORT_CODE(KEYCODE_Z)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 1") PORT_CODE(KEYCODE_X)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 2") PORT_CODE(KEYCODE_C)
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Bit 3") PORT_CODE(KEYCODE_V)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4) PORT_NAME("Payout")
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE3 ) PORT_NAME("Limit Over")
-	PORT_SERVICE( 0x40, IP_ACTIVE_LOW )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F2) PORT_NAME("Analyzer")
-
-	PORT_START("DSW1")
-	PORT_DIPUNUSED_DIPLOC( 0x01, 0x00, "SW1:!1" ) /* Listed as "Unused" */
-	PORT_DIPNAME( 0x02, 0x00, "Hopper Out Switch" ) PORT_DIPLOCATION("SW1:!2")
-	PORT_DIPSETTING(    0x02, "Active High" )
-	PORT_DIPSETTING(    0x00, "Active Low" )
-	PORT_DIPNAME( 0x04, 0x00, "Type Of Payout" ) PORT_DIPLOCATION("SW1:!3")
-	PORT_DIPSETTING(    0x04, "Automatic" )
-	PORT_DIPSETTING(    0x00, "Payout SH" )
-	PORT_DIPNAME( 0x08, 0x00, "@ IN DoubleUp" ) PORT_DIPLOCATION("SW1:!4")
-	PORT_DIPSETTING(    0x08, "Even" )
-	PORT_DIPSETTING(    0x00, "LOST" )
-	PORT_DIPNAME( 0x10, 0x00, "DoubleUp Pay-Rate" ) PORT_DIPLOCATION("SW1:!5")
-	PORT_DIPSETTING(    0x00, "80%" )
-	PORT_DIPSETTING(    0x10, "90%" )
-	PORT_DIPNAME( 0x20, 0x00, "DoubleUp" ) PORT_DIPLOCATION("SW1:!6")
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0xc0, 0x00, "Bet Max" ) PORT_DIPLOCATION("SW1:!7,!8") /* Manual says 8/16/32/64 */
-	PORT_DIPSETTING(    0x00, "16 Bet" )
-	PORT_DIPSETTING(    0x40, "32 Bet" )
-	PORT_DIPSETTING(    0x80, "64 Bet" )
-	PORT_DIPSETTING(    0xc0, "96 Bet" )
-
-	PORT_START("DSW2")
-	PORT_DIPNAME( 0x07, 0x07, "Main Game Pay-Rate" ) PORT_DIPLOCATION("SW2:!1,!2,!3")
-	PORT_DIPSETTING(    0x07, "55 30% 45" ) /* Displays 35% */
-	PORT_DIPSETTING(    0x06, "60 38% 50" ) /* Displays 40% */
-	PORT_DIPSETTING(    0x05, "65 46% 55" ) /* Displays 45% */
-	PORT_DIPSETTING(    0x04, "70 54% 60" ) /* Displays 50% */
-	PORT_DIPSETTING(    0x03, "75 62% 65" ) /* Displays 55% */
-	PORT_DIPSETTING(    0x02, "80 70% 70" ) /* Displays 60% */
-	PORT_DIPSETTING(    0x01, "85 78% 75" ) /* Displays 65% */
-	PORT_DIPSETTING(    0x00, "90 86% 80" ) /* Displays 70% */
-	PORT_DIPNAME( 0x18, 0x18, "Hopper Limit" ) PORT_DIPLOCATION("SW2:!4,!5")
-	PORT_DIPSETTING(    0x00, "300" )
-	PORT_DIPSETTING(    0x08, "500" )
-	PORT_DIPSETTING(    0x10, "1000" )
-	PORT_DIPSETTING(    0x18, "Unlimited" )
-	PORT_DIPNAME( 0x20, 0x20, "Sound On/Off Odds Over 100" ) PORT_DIPLOCATION("SW2:!6")
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, "Type Of Key In" ) PORT_DIPLOCATION("SW2:!7") /* Manual says C-Type/D-Type probably a typo */
-	PORT_DIPSETTING(    0x40, "A-Type" )
-	PORT_DIPSETTING(    0x00, "B-Type" )
-	PORT_DIPNAME( 0x80, 0x80, "Bet Limit For Center Super 7" ) PORT_DIPLOCATION("SW2:!8")
-	PORT_DIPSETTING(    0x00, "Unlimited" )
-	PORT_DIPSETTING(    0x80, "Limited" ) /* "Number is fixed by 4-6" */
-
-	PORT_START("DSW3")
-	PORT_DIPNAME( 0x03, 0x03, "Key In Rate" ) PORT_DIPLOCATION("SW3:1,2")
-	PORT_DIPSETTING(    0x00, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40) // A-Type
-	PORT_DIPSETTING(    0x01, "1 Coin/20 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40)
-	PORT_DIPSETTING(    0x02, "1 Coin/50 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40)
-	PORT_DIPSETTING(    0x03, "1 Coin/100 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x40)
-	PORT_DIPSETTING(    0x00, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x00) // B-Type
-	PORT_DIPSETTING(    0x01, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x00)
-	PORT_DIPSETTING(    0x02, "1 Coin/25 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x00)
-	PORT_DIPSETTING(    0x03, "1 Coin/50 Credits" ) PORT_CONDITION("DSW2",0x40,PORTCOND_EQUALS,0x00)
-	PORT_DIPNAME( 0x0c, 0x0c, "Coin A Rate" ) PORT_DIPLOCATION("SW3:3,4")
-	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( 1C_2C ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( 1C_5C ) )
-	PORT_DIPSETTING(    0x0c, "1 Coin/10 Credits" )
-	PORT_DIPNAME( 0x30, 0x30, "Coin D Rate" ) PORT_DIPLOCATION("SW3:5,6")
-	PORT_DIPSETTING(    0x00, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x00) // C-Type
-	PORT_DIPSETTING(    0x10, "1 Coin/10 Credits" ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x00)
-	PORT_DIPSETTING(    0x20, "1 Coin/25 Credits" ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x00)
-	PORT_DIPSETTING(    0x30, "1 Coin/50 Credits" ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x00)
-	PORT_DIPSETTING(    0x00, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x10) // D-Type
-	PORT_DIPSETTING(    0x10, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x10)
-	PORT_DIPSETTING(    0x20, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x10)
-	PORT_DIPSETTING(    0x30, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW4",0x10,PORTCOND_EQUALS,0x10)
-	PORT_DIPNAME( 0xc0, 0xc0, "Coin C Rate" ) PORT_DIPLOCATION("SW3:7,8")
-	PORT_DIPSETTING(    0xc0, DEF_STR( 1C_1C ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( 1C_2C ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( 1C_5C ) )
-	PORT_DIPSETTING(    0x00, "1 Coin/10 Credits" )
-
-	PORT_START("DSW4")
-	PORT_DIPNAME( 0x07, 0x07, "Credit Limit" ) PORT_DIPLOCATION("SW4:1,2,3")
-	PORT_DIPSETTING(    0x07, "5,000" )
-	PORT_DIPSETTING(    0x06, "10,000" )
-	PORT_DIPSETTING(    0x05, "20,000" )
-	PORT_DIPSETTING(    0x04, "30,000" )
-	PORT_DIPSETTING(    0x03, "40,000" )
-	PORT_DIPSETTING(    0x02, "50,000" )
-	PORT_DIPSETTING(    0x01, "100,000" )
-	PORT_DIPSETTING(    0x00, "Unlimited" )
-	PORT_DIPNAME( 0x08, 0x08, "Display Of Payout Limit" ) PORT_DIPLOCATION("SW4:4")
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, "Type Of Coin D" ) PORT_DIPLOCATION("SW4:5")
-	PORT_DIPSETTING(    0x10, "C-Type" )
-	PORT_DIPSETTING(    0x00, "D-Type" )
-	PORT_DIPNAME( 0x20, 0x20, "Min. Bet For Bonus Play" ) PORT_DIPLOCATION("SW4:6")
-	PORT_DIPSETTING(    0x20, "16 Bet" )
-	PORT_DIPSETTING(    0x00, "8 Bet" )
-	PORT_DIPNAME( 0x40, 0x40, "Reel Speed" ) PORT_DIPLOCATION("SW4:7")
-	PORT_DIPSETTING(    0x40, DEF_STR( High ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Low ) )
-	PORT_DIPNAME( 0x80, 0x80, "Hopper Out By Coin A" ) PORT_DIPLOCATION("SW4:8")
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-
-	PORT_START("DSW5")
-	PORT_DIPNAME( 0x01, 0x01, "Display Of Doll On Demo" ) PORT_DIPLOCATION("SW5:1")
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x06, 0x06, "Coin In Limit" ) PORT_DIPLOCATION("SW5:2,3")
-	PORT_DIPSETTING(    0x06, "1,000" )
-	PORT_DIPSETTING(    0x04, "5,000" )
-	PORT_DIPSETTING(    0x02, "10,000" )
-	PORT_DIPSETTING(    0x00, "20,000" )
-	PORT_DIPNAME( 0x18, 0x18, "Condition For 3 Kind Of Bonus" ) PORT_DIPLOCATION("SW5:4,5")
-	PORT_DIPSETTING(    0x18, "12-7-1" )
-	PORT_DIPSETTING(    0x10, "9-5-1" )
-	PORT_DIPSETTING(    0x08, "6-3-1" )
-	PORT_DIPSETTING(    0x00, "3-2-1" )
-	PORT_DIPNAME( 0x20, 0x20, "Display Of Doll At All Fr. Bonus" ) PORT_DIPLOCATION("SW5:6")
-	PORT_DIPSETTING(    0x20, DEF_STR( Low ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( High ) )
-	PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "SW5:7" ) /* Listed as "Unused" */
-	PORT_DIPNAME( 0x80, 0x80, "Test Mode For Disp. Of Doll" ) PORT_DIPLOCATION("SW5:8")
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-INPUT_PORTS_END
-
-static const gfx_layout charlayout =
-{
-	8, 8,
-	4096,
-	3,
-	{ 0, 0x8000*8, 0x10000*8 },
-	{ 0, 1, 2, 3, 4, 5, 6, 7 },
-	{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
-	8*8
-};
-
-static const UINT32 spritelayout_xoffset[80] =
-{
-	  0+0*32*8, 1+0*32*8, 2+0*32*8, 3+0*32*8, 4+0*32*8, 5+0*32*8, 6+0*32*8, 7+0*32*8,
-	  0+1*32*8, 1+1*32*8, 2+1*32*8, 3+1*32*8, 4+1*32*8, 5+1*32*8, 6+1*32*8, 7+1*32*8,
-	  0+2*32*8, 1+2*32*8, 2+2*32*8, 3+2*32*8, 4+2*32*8, 5+2*32*8, 6+2*32*8, 7+2*32*8,
-	  0+3*32*8, 1+3*32*8, 2+3*32*8, 3+3*32*8, 4+3*32*8, 5+3*32*8, 6+3*32*8, 7+3*32*8,
-	  0+4*32*8, 1+4*32*8, 2+4*32*8, 3+4*32*8, 4+4*32*8, 5+4*32*8, 6+4*32*8, 7+4*32*8,
-	  0+5*32*8, 1+5*32*8, 2+5*32*8, 3+5*32*8, 4+5*32*8, 5+5*32*8, 6+5*32*8, 7+5*32*8,
-	  0+6*32*8, 1+6*32*8, 2+6*32*8, 3+6*32*8, 4+6*32*8, 5+6*32*8, 6+6*32*8, 7+6*32*8,
-	  0+7*32*8, 1+7*32*8, 2+7*32*8, 3+7*32*8, 4+7*32*8, 5+7*32*8, 6+7*32*8, 7+7*32*8,
-	  0+8*32*8, 1+8*32*8, 2+8*32*8, 3+8*32*8, 4+8*32*8, 5+8*32*8, 6+8*32*8, 7+8*32*8,
-	  0+9*32*8, 1+9*32*8, 2+9*32*8, 3+9*32*8, 4+9*32*8, 5+9*32*8, 6+9*32*8, 7+9*32*8
-};
-
-static const gfx_layout spritelayout =
-{
-	80, 32,
-	12,
-	4,
-	{ 0, 0x2000*8, 0x4000*8, 0x6000*8 },
-	EXTENDED_XOFFS,
-	{
-		   0*8,  1*8,  2*8,  3*8,  4*8,  5*8,  6*8,  7*8,  8*8,  9*8, 10*8, 11*8, 12*8, 13*8, 14*8, 15*8,
-		  16*8, 17*8, 18*8, 19*8, 20*8, 21*8, 22*8, 23*8, 24*8, 25*8, 26*8, 27*8, 28*8, 29*8, 30*8, 31*8
-	},
-	10*32*8,
-	spritelayout_xoffset,
-	NULL
-};
-
-static GFXDECODE_START( cherrym )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout,	  0, 16 )
-	GFXDECODE_ENTRY( "gfx2", 0x0020, spritelayout, 0, 16 )
-GFXDECODE_END
-
-static const ay8910_interface ay8910_config =
-{
-	AY8910_LEGACY_OUTPUT,
-	AY8910_DEFAULT_LOADS,
-	input_port_6_r,	//
-	input_port_7_r,	//
-	NULL,
-	NULL
-};
-
-static MACHINE_DRIVER_START( cmv801 )
-	// basic machine hardware
-	MDRV_CPU_ADD("main", Z80, 8000000/2)	// ???
-	MDRV_CPU_PROGRAM_MAP(cm_map, 0)
-	MDRV_CPU_IO_MAP(cm_io_map, 0)
-	MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
-
-	//MDRV_NVRAM_HANDLER(cmv801)
-
-	// video hardware
-
-	MDRV_SCREEN_ADD("main", RASTER)
-	MDRV_SCREEN_REFRESH_RATE(60)
-	MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
-	MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
-	MDRV_SCREEN_SIZE(64*8, 32*8)
-	MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 2*8, 30*8-1)
-
-	MDRV_GFXDECODE(cherrym)
-	MDRV_PALETTE_LENGTH(256)
-
-	MDRV_PALETTE_INIT(cm)
-	MDRV_VIDEO_START(cm)
-	MDRV_VIDEO_UPDATE(cm)
-
-	// sound hardware
-	MDRV_SPEAKER_STANDARD_MONO("mono")
-	MDRV_SOUND_ADD("ay", AY8910,18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_config)
-	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-
-MACHINE_DRIVER_END
-
-ROM_START( cmv801 )
-	ROM_REGION( 0x10000, "main", 0 )
-	ROM_LOAD( "prg512",   0x0000, 0x10000, CRC(2f6e3fe9) SHA1(c5ffa51478a0dc2d8ff6a0f286cfb461011bb55d) )
-
-	ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE )
-	ROM_LOAD( "m5.256",   0x00000, 0x8000, CRC(19cc1d67) SHA1(47487f9362bfb36a32100ed772960628844462bf) )
-	ROM_LOAD( "m6.256",   0x08000, 0x8000, CRC(63b3df4e) SHA1(9bacd23da598805ec18ec5ad15cab95d71eb9262) )
-	ROM_LOAD( "m7.256",   0x10000, 0x8000, CRC(e39fff9c) SHA1(22fdc517fa478441622c6245cecb5728c5595757) )
-
-	ROM_REGION( 0x8000, "gfx2", ROMREGION_DISPOSE )
-	ROM_LOAD( "m1.64",     0x0000, 0x2000, CRC(6dfcb188) SHA1(22430429c798954d9d979e62699b58feae7fdbf4) )
-	ROM_LOAD( "m2.64",     0x2000, 0x2000, CRC(9678ead2) SHA1(e80aefa98b2363fe9e6b2415762695ace272e4d3) )
-	ROM_LOAD( "m3.64",     0x4000, 0x2000, CRC(8607ffd9) SHA1(9bc94715554aa2473ae2ed249a47f29c7886b3dc) )
-	ROM_LOAD( "m4.64",	   0x6000, 0x2000, CRC(c32367be) SHA1(ff217021b9c58e23b2226f8b0a7f5da966225715) )
-
-	ROM_REGION( 0x300, "proms", 0 )
-	ROM_LOAD( "prom1.287", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) )
-	ROM_LOAD( "prom2.287", 0x0100, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) )
-	ROM_LOAD( "prom3.287", 0x0200, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) )
-ROM_END
-
-GAME( 198?, cmv801, 0, cmv801, cmv801, 0, ROT0, "Corsica", "Cherry Master (v8.01)", GAME_IMPERFECT_GRAPHICS | GAME_WRONG_COLORS | GAME_NOT_WORKING )
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index af68461ed4e..eec8022507d 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -1556,7 +1556,6 @@ $(MAMEOBJ)/misc.a: \
 	$(DRIVERS)/calomega.o $(VIDEO)/calomega.o \
 	$(DRIVERS)/carrera.o \
 	$(DRIVERS)/cave.o $(VIDEO)/cave.o \
-	$(DRIVERS)/cherrym.o \
 	$(DRIVERS)/cidelsa.o $(VIDEO)/cidelsa.o \
 	$(DRIVERS)/coinmstr.o \
 	$(DRIVERS)/comebaby.o \