Merge pull request #1504 from frappe/model-cleanup

Model cleanup