diff --git a/frappe/core/doctype/property_setter/property_setter.json b/frappe/core/doctype/property_setter/property_setter.json
deleted file mode 100644
index 4345500ce5..0000000000
--- a/frappe/core/doctype/property_setter/property_setter.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
- "allow_import": 1, 
- "creation": "2013-01-10 16:34:04", 
- "description": "Property Setter overrides a standard DocType or Field property", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "fieldname": "help", 
-   "fieldtype": "HTML", 
-   "label": "Help", 
-   "options": "<div class=\"alert\">Please don't update it as it can mess up your form. Use the Customize Form View and Custom Fields to set properties!</div>", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "sb0", 
-   "fieldtype": "Section Break", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "eval:doc.__islocal", 
-   "fieldname": "doctype_or_field", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "DocType or Field", 
-   "options": "\nDocField\nDocType", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "description": "New value to be set", 
-   "fieldname": "value", 
-   "fieldtype": "Text", 
-   "in_list_view": 1, 
-   "label": "Set Value", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "doc_type", 
-   "fieldtype": "Link", 
-   "in_filter": 0, 
-   "label": "DocType", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "reqd": 1, 
-   "search_index": 1
-  }, 
-  {
-   "depends_on": "eval:doc.doctype_or_field=='DocField'", 
-   "description": "ID (name) of the entity whose property is to be set", 
-   "fieldname": "field_name", 
-   "fieldtype": "Data", 
-   "in_filter": 0, 
-   "label": "Field Name", 
-   "permlevel": 0, 
-   "reqd": 0, 
-   "search_index": 1
-  }, 
-  {
-   "fieldname": "property", 
-   "fieldtype": "Data", 
-   "in_filter": 0, 
-   "label": "Property", 
-   "permlevel": 0, 
-   "reqd": 1, 
-   "search_index": 1
-  }, 
-  {
-   "fieldname": "property_type", 
-   "fieldtype": "Data", 
-   "label": "Property Type", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "default_value", 
-   "fieldtype": "Data", 
-   "label": "Default Value", 
-   "permlevel": 0
-  }
- ], 
- "icon": "icon-glass", 
- "idx": 1, 
- "modified": "2014-12-11 10:51:52.727473", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Property Setter", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Administrator", 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "search_fields": "doc_type,property"
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/todo/todo.json b/frappe/core/doctype/todo/todo.json
deleted file mode 100644
index a9e2fcf524..0000000000
--- a/frappe/core/doctype/todo/todo.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "TDI.########", 
- "creation": "2012-07-03 13:30:35", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "fieldname": "description_and_status", 
-   "fieldtype": "Section Break", 
-   "label": "Description and Status", 
-   "permlevel": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "300px", 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "width": "300px"
-  }, 
-  {
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
-   "default": "Open", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "Status", 
-   "options": "Open\nClosed", 
-   "permlevel": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "default": "Medium", 
-   "fieldname": "priority", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Priority", 
-   "no_copy": 0, 
-   "oldfieldname": "priority", 
-   "oldfieldtype": "Data", 
-   "options": "High\nMedium\nLow", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Due Date", 
-   "no_copy": 0, 
-   "oldfieldname": "date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "ignore_user_permissions": 1, 
-   "in_list_view": 0, 
-   "label": "Assigned To", 
-   "options": "User", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "section_break_6", 
-   "fieldtype": "Section Break", 
-   "label": "Reference", 
-   "permlevel": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "reference_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Reference Type", 
-   "no_copy": 0, 
-   "oldfieldname": "reference_type", 
-   "oldfieldtype": "Data", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Reference Name", 
-   "no_copy": 0, 
-   "oldfieldname": "reference_name", 
-   "oldfieldtype": "Data", 
-   "options": "reference_type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "role", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Role", 
-   "no_copy": 0, 
-   "oldfieldname": "role", 
-   "oldfieldtype": "Link", 
-   "options": "Role", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
-   "fieldname": "assigned_by", 
-   "fieldtype": "Link", 
-   "ignore_user_permissions": 1, 
-   "label": "Assigned By", 
-   "options": "User", 
-   "permlevel": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-check", 
- "idx": 1, 
- "in_create": 0, 
- "in_dialog": 0, 
- "issingle": 0, 
- "max_attachments": 0, 
- "modified": "2014-12-11 10:52:00.765033", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "ToDo", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "apply_user_permissions": 1, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "write": 1
-  }
- ], 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "description, reference_type, reference_name", 
- "title_field": "description"
-}
\ No newline at end of file
diff --git a/frappe/patches.txt b/frappe/patches.txt
index ecbc62036a..3c77cf1e5b 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -6,8 +6,8 @@ execute:frappe.reload_doc('core', 'doctype', 'page') #2013-13-26
 execute:frappe.reload_doc('core', 'doctype', 'report') #2014-06-03
 execute:frappe.reload_doc('core', 'doctype', 'version') #2014-02-21
 execute:frappe.reload_doc('email', 'doctype', 'email_alert') #2014-07-15
-execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31
-execute:frappe.reload_doc('custom', 'doctype', 'property_setter') #2014-12-31
+execute:frappe.reload_doc('desk', 'doctype', 'todo') #2014-12-31-1
+execute:frappe.reload_doc('custom', 'doctype', 'property_setter') #2014-12-31-1
 execute:frappe.db.sql("alter table `tabSessions` modify `user` varchar(255), engine=InnoDB")
 execute:frappe.db.sql("delete from `tabDocField` where parent='0'")
 frappe.patches.v4_0.change_varchar_length