diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index bd223b50b2..c53f2a6d74 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -701,7 +701,7 @@ def get_children(doctype, parent, company, is_root=False):
 	return acc
 
 def create_payment_gateway_account(gateway):
-	from erpnext.setup.setup_wizard.setup_wizard import create_bank_account
+	from erpnext.setup.setup_wizard.operations.company_setup import create_bank_account
 
 	company = frappe.db.get_value("Global Defaults", None, "default_company")
 	if not company:
diff --git a/erpnext/setup/setup_wizard/operations/sample_data.py b/erpnext/setup/setup_wizard/operations/sample_data.py
index c302841ec8..380466cb6b 100644
--- a/erpnext/setup/setup_wizard/operations/sample_data.py
+++ b/erpnext/setup/setup_wizard/operations/sample_data.py
@@ -31,8 +31,6 @@ def make_sample_data(domains, make_dependent = False):
 	make_projects(domains)
 	import_email_alert()
 
-	frappe.db.commit()
-
 def make_opportunity(items, customer):
 	b = frappe.get_doc({
 		"doctype": "Opportunity",