diff --git a/src/emu/machine.c b/src/emu/machine.c
index bb570ca7452..6f8c9778214 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -225,6 +225,8 @@ running_machine::running_machine(const game_driver &driver, const machine_config
 
 running_machine::~running_machine()
 {
+	/* clear flag for added devices */
+	options_set_bool(&m_options, OPTION_ADDED_DEVICE_OPTIONS, FALSE, OPTION_PRIORITY_CMDLINE);
 }
 
 
diff --git a/src/emu/mame.c b/src/emu/mame.c
index dc58f1e788f..361a7aa7f9e 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -564,9 +564,6 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
 	filerr = mame_fopen_options(options, SEARCHPATH_INI, fname, OPEN_FLAG_READ, &file);
 	if (filerr != FILERR_NONE)
 		return FALSE;
-
-	/* clear flag for added devices */
-	options_set_bool(options, OPTION_ADDED_DEVICE_OPTIONS, FALSE, OPTION_PRIORITY_CMDLINE);
 	
 	/* update game name so depending callback options could be added */
 	if (priority==OPTION_PRIORITY_DRIVER_INI) {		
@@ -574,7 +571,6 @@ static int parse_ini_file(core_options *options, const char *name, int priority)
 	}
 	
 	/* parse the file and close it */
-	mame_printf_verbose("Parsing %s.ini\n", name);
 	options_parse_ini_file(options, mame_core_file(file), priority);
 	mame_fclose(file);
 	return TRUE;