diff --git a/erpnext/non_profit/doctype/chapter/chapter.js b/erpnext/non_profit/doctype/chapter/chapter.js
index c7841e1..c8b6d4a 100644
--- a/erpnext/non_profit/doctype/chapter/chapter.js
+++ b/erpnext/non_profit/doctype/chapter/chapter.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Chapter', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });
diff --git a/erpnext/non_profit/doctype/chapter/chapter.py b/erpnext/non_profit/doctype/chapter/chapter.py
index c93214b..6f990fd 100644
--- a/erpnext/non_profit/doctype/chapter/chapter.py
+++ b/erpnext/non_profit/doctype/chapter/chapter.py
@@ -5,20 +5,11 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.model.document import Document
-from frappe import _
 
 class Chapter(WebsiteGenerator):
 	def get_context(self, context):
 		context.no_cache = True
 
-	def validate(self):
-		chapter_head = self.chapter_head
-		chapter = frappe.get_all('Chapter', filters={'published': True}, fields=['chapter_head'])
-
-		# if chapter_head in [d.chapter_head for d in chapter]:
-			# frappe.throw(_('You are not allow to create more than one Chapter'))
-
 	def enable(self):
 		chapter = frappe.get_doc('Chapter', frappe.form_dict.name)
 		chapter.append('members', dict(enable=self.value))
diff --git a/erpnext/non_profit/doctype/chapter/test_chapter.py b/erpnext/non_profit/doctype/chapter/test_chapter.py
index ff1ac9a..d757a1f 100644
--- a/erpnext/non_profit/doctype/chapter/test_chapter.py
+++ b/erpnext/non_profit/doctype/chapter/test_chapter.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestChapter(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/chapter_member/chapter_member.py b/erpnext/non_profit/doctype/chapter_member/chapter_member.py
index 0e0248d..16fe7fb 100644
--- a/erpnext/non_profit/doctype/chapter_member/chapter_member.py
+++ b/erpnext/non_profit/doctype/chapter_member/chapter_member.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class ChapterMember(Document):
diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.js b/erpnext/non_profit/doctype/chapter_message/chapter_message.js
index 832c93b..92d2753 100644
--- a/erpnext/non_profit/doctype/chapter_message/chapter_message.js
+++ b/erpnext/non_profit/doctype/chapter_message/chapter_message.js
@@ -3,10 +3,8 @@
 
 frappe.ui.form.on('Chapter Message', {
 	onload: function(frm){
-		console.log("here" + frappe.session.user)
-		chapter_head = frappe.session.user
-		frappe.db.get_value('Chapter', {chapter_head: chapter_head}, 'name', function(data) {
-		  frm.set_value('chapter', data.name);
-		})
+		frappe.db.get_value('Chapter', {chapter_head: frappe.session.user}, 'name', function(data) {
+			frm.set_value('chapter', data.name);
+		});
 	},
 });
diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.py b/erpnext/non_profit/doctype/chapter_message/chapter_message.py
index c7dd73e..64e54d5 100644
--- a/erpnext/non_profit/doctype/chapter_message/chapter_message.py
+++ b/erpnext/non_profit/doctype/chapter_message/chapter_message.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 from frappe import _
 
diff --git a/erpnext/non_profit/doctype/donor/donor.js b/erpnext/non_profit/doctype/donor/donor.js
index 494ef64..090d5af 100644
--- a/erpnext/non_profit/doctype/donor/donor.js
+++ b/erpnext/non_profit/doctype/donor/donor.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Donor', {
 	refresh: function(frm) {
-		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Donor'}
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Donor'};
 
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
diff --git a/erpnext/non_profit/doctype/donor/donor.py b/erpnext/non_profit/doctype/donor/donor.py
index d775c83..9121d0c 100644
--- a/erpnext/non_profit/doctype/donor/donor.py
+++ b/erpnext/non_profit/doctype/donor/donor.py
@@ -3,9 +3,8 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
-from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class Donor(Document):
 	def onload(self):
diff --git a/erpnext/non_profit/doctype/donor/test_donor.py b/erpnext/non_profit/doctype/donor/test_donor.py
index 45b8c6e..3b6724e 100644
--- a/erpnext/non_profit/doctype/donor/test_donor.py
+++ b/erpnext/non_profit/doctype/donor/test_donor.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestDonor(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.js b/erpnext/non_profit/doctype/donor_type/donor_type.js
index 8ab5f4c..7b1fd4f 100644
--- a/erpnext/non_profit/doctype/donor_type/donor_type.js
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Donor Type', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.py b/erpnext/non_profit/doctype/donor_type/donor_type.py
index b927ed4..e9262ac 100644
--- a/erpnext/non_profit/doctype/donor_type/donor_type.py
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class DonorType(Document):
diff --git a/erpnext/non_profit/doctype/donor_type/test_donor_type.py b/erpnext/non_profit/doctype/donor_type/test_donor_type.py
index 74317f4..e793913 100644
--- a/erpnext/non_profit/doctype/donor_type/test_donor_type.py
+++ b/erpnext/non_profit/doctype/donor_type/test_donor_type.py
@@ -3,7 +3,7 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
+
 import unittest
 
 class TestDonorType(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.js b/erpnext/non_profit/doctype/grant_application/grant_application.js
index f4ac132..bfc2f65 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application.js
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Grant Application', {
 	refresh: function(frm) {
-		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Grant Application'}
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Grant Application'};
 
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.py b/erpnext/non_profit/doctype/grant_application/grant_application.py
index 2a48138..7049ca3 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application.py
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class GrantApplication(Document):
 	def onload(self):
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application_list.js b/erpnext/non_profit/doctype/grant_application/grant_application_list.js
index a1adb22..37da54c 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application_list.js
+++ b/erpnext/non_profit/doctype/grant_application/grant_application_list.js
@@ -1,3 +1,3 @@
 frappe.listview_settings['Grant Application'] = {
-    add_fields: ["grant_application_name", "image"],
+	add_fields: ["grant_application_name", "image"],
 };
diff --git a/erpnext/non_profit/doctype/grant_application/test_grant_application.py b/erpnext/non_profit/doctype/grant_application/test_grant_application.py
index fc9dfdf..da16acf 100644
--- a/erpnext/non_profit/doctype/grant_application/test_grant_application.py
+++ b/erpnext/non_profit/doctype/grant_application/test_grant_application.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestGrantApplication(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js
index 805d125..5cfbe42 100644
--- a/erpnext/non_profit/doctype/member/member.js
+++ b/erpnext/non_profit/doctype/member/member.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Member', {
 	refresh: function(frm) {
 
-		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Member'}
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Member'};
 
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index 083d698..e0ad7fc 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -3,9 +3,8 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
-from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class Member(Document):
 	def onload(self):
diff --git a/erpnext/non_profit/doctype/member/member_list.js b/erpnext/non_profit/doctype/member/member_list.js
index 9a10f21..af1b822 100644
--- a/erpnext/non_profit/doctype/member/member_list.js
+++ b/erpnext/non_profit/doctype/member/member_list.js
@@ -1,3 +1,3 @@
 frappe.listview_settings['Member'] = {
-    add_fields: ["member_name", "member_type", "image"],
+	add_fields: ["member_name", "member_type", "image"],
 };
diff --git a/erpnext/non_profit/doctype/member/test_member.py b/erpnext/non_profit/doctype/member/test_member.py
index ae5865c..748a500 100644
--- a/erpnext/non_profit/doctype/member/test_member.py
+++ b/erpnext/non_profit/doctype/member/test_member.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestMember(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/membership/test_membership.py b/erpnext/non_profit/doctype/membership/test_membership.py
index 150397d..b23f406 100644
--- a/erpnext/non_profit/doctype/membership/test_membership.py
+++ b/erpnext/non_profit/doctype/membership/test_membership.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestMembership(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
index 2fb47a1..3ef39ae 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.js
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Membership Type', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });
diff --git a/erpnext/non_profit/doctype/membership_type/test_membership_type.py b/erpnext/non_profit/doctype/membership_type/test_membership_type.py
index a9d9043..d2c9bee 100644
--- a/erpnext/non_profit/doctype/membership_type/test_membership_type.py
+++ b/erpnext/non_profit/doctype/membership_type/test_membership_type.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestMembershipType(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/volunteer/test_volunteer.py b/erpnext/non_profit/doctype/volunteer/test_volunteer.py
index 86ba0f0..6f3bee0 100644
--- a/erpnext/non_profit/doctype/volunteer/test_volunteer.py
+++ b/erpnext/non_profit/doctype/volunteer/test_volunteer.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestVolunteer(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.js b/erpnext/non_profit/doctype/volunteer/volunteer.js
index 1d47d6d..ac93d8c 100644
--- a/erpnext/non_profit/doctype/volunteer/volunteer.js
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Volunteer', {
 	refresh: function(frm) {
 
-		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Volunteer'}
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Volunteer'};
 
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.py b/erpnext/non_profit/doctype/volunteer/volunteer.py
index 2c02ea0..699868a 100644
--- a/erpnext/non_profit/doctype/volunteer/volunteer.py
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.py
@@ -3,9 +3,8 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
-from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class Volunteer(Document):
 	def onload(self):
diff --git a/erpnext/non_profit/doctype/volunteer_availability/test_volunteer_availability.py b/erpnext/non_profit/doctype/volunteer_availability/test_volunteer_availability.py
index 5502194..42b3329 100644
--- a/erpnext/non_profit/doctype/volunteer_availability/test_volunteer_availability.py
+++ b/erpnext/non_profit/doctype/volunteer_availability/test_volunteer_availability.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestVolunteerAvailability(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.js b/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.js
index a19e9a0..a155733 100644
--- a/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.js
+++ b/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Volunteer Availability', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });
diff --git a/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.py b/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.py
index a159e49..6a8f73e 100644
--- a/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.py
+++ b/erpnext/non_profit/doctype/volunteer_availability/volunteer_availability.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class VolunteerAvailability(Document):
diff --git a/erpnext/non_profit/doctype/volunteer_skills/volunteer_skills.py b/erpnext/non_profit/doctype/volunteer_skills/volunteer_skills.py
index 9909f9f..2b54ea5 100644
--- a/erpnext/non_profit/doctype/volunteer_skills/volunteer_skills.py
+++ b/erpnext/non_profit/doctype/volunteer_skills/volunteer_skills.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class VolunteerSkills(Document):
diff --git a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py
index 0111d66..78f65c7 100644
--- a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py
+++ b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.py
@@ -3,7 +3,6 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
 import unittest
 
 class TestVolunteerType(unittest.TestCase):
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js
index 357c09c..5c17505 100644
--- a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Volunteer Type', {
-	refresh: function(frm) {
+	refresh: function() {
 
 	}
 });
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py
index fc2a124..9776402 100644
--- a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.py
@@ -3,7 +3,6 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
 from frappe.model.document import Document
 
 class VolunteerType(Document):