diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index eccdce7a42f..9f1afd920f7 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -129,8 +129,6 @@ website_route_rules = [
 	{"from_route": "/admissions", "to_route": "Student Admission"},
 	{"from_route": "/boms", "to_route": "BOM"},
 	{"from_route": "/timesheets", "to_route": "Timesheet"},
-	{"from_route": "/grant-application", "to_route": "Grant Application"},
-	{"from_route": "/chapters", "to_route": "Chapter"},
 ]
 
 standard_portal_menu_items = [
@@ -151,8 +149,6 @@ standard_portal_menu_items = [
 	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"},
 	{"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
 	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"},
-	{"title": _("Grant Application"), "route": "/grant-application", "reference_doctype": "Grant Application", "role": "Non Profit Portal User"},
-	{"title": _("Chapter"), "route": "/chapters", "reference_doctype": "Chapter"}
 ]
 
 default_roles = [
diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter_row.html b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html
index afa6183be88..cad34fa5bed 100644
--- a/erpnext/non_profit/doctype/chapter/templates/chapter_row.html
+++ b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html
@@ -1,6 +1,6 @@
 {% if doc.published %}
 	<div style="margin-bottom: 30px; max-width: 600px" class="with-border clickable">
-		<a href={{ route }}>
+		<a href={{ doc.route }}>
 			<h3>{{ doc.name }}</h3>
 			<p>
 				<span class="label"> Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }} </span>
diff --git a/erpnext/setup/setup_wizard/operations/sample_data.py b/erpnext/setup/setup_wizard/operations/sample_data.py
index 380466cb6b4..6f076408666 100644
--- a/erpnext/setup/setup_wizard/operations/sample_data.py
+++ b/erpnext/setup/setup_wizard/operations/sample_data.py
@@ -166,11 +166,11 @@ def import_email_alert():
 		email_alert.insert()
 
 	# trigger the first message!
-	from frappe.email.doctype.email_alert.email_alert import trigger_daily_alerts
+	from frappe.email.doctype.notification.notification import trigger_daily_alerts
 	trigger_daily_alerts()
 
 def test_sample():
-	frappe.db.sql('delete from `tabEmail Alert`')
+	frappe.db.sql('delete from `tabNotification`')
 	frappe.db.sql('delete from tabProject')
 	frappe.db.sql('delete from tabTask')
 	make_projects('Education')