diff --git a/src/lib/netlist/nl_parser.cpp b/src/lib/netlist/nl_parser.cpp
index 5521608a111..e3afd6d62a3 100644
--- a/src/lib/netlist/nl_parser.cpp
+++ b/src/lib/netlist/nl_parser.cpp
@@ -352,7 +352,6 @@ void parser_t::device(const pstring &dev_type)
 	else
 	{
 		base_factory_t *f = m_setup.factory().factory_by_name(dev_type);
-		device_t *dev;
 		pstring_vector_t termlist = f->term_param_list();
 		pstring_vector_t def_params = f->def_params();
 
@@ -360,8 +359,7 @@ void parser_t::device(const pstring &dev_type)
 
 		pstring devname = get_identifier();
 
-		dev = f->Create(m_setup.netlist(), m_setup.build_fqn(devname));
-		m_setup.register_dev(dev);
+		m_setup.register_dev(dev_type, m_setup.build_fqn(devname));
 
 		m_setup.log().debug("Parser: IC: {1}\n", devname);
 
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index f075ff6a2f5..aecf3ff0f1a 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -114,7 +114,6 @@ namespace netlist
 
 		void register_dev(device_t *dev);
 		void register_dev(const pstring &classname, const pstring &name);
-		void remove_dev(const pstring &name);
 
 		void register_lib_entry(const pstring &name);
 
@@ -140,9 +139,6 @@ namespace netlist
 
 		bool device_exists(const pstring name) const;
 
-		core_terminal_t *find_terminal(const pstring &outname_in, bool required = true);
-		core_terminal_t *find_terminal(const pstring &outname_in, object_t::type_t atype, bool required = true);
-
 		param_t *find_param(const pstring &param_in, bool required = true);
 
 		void start_devices();
@@ -183,6 +179,9 @@ namespace netlist
 
 	private:
 
+		core_terminal_t *find_terminal(const pstring &outname_in, bool required = true);
+		core_terminal_t *find_terminal(const pstring &outname_in, object_t::type_t atype, bool required = true);
+
 		void connect_terminals(core_terminal_t &in, core_terminal_t &out);
 		void connect_input_output(core_terminal_t &in, core_terminal_t &out);
 		void connect_terminal_output(terminal_t &in, core_terminal_t &out);