frappe/frappe#478, more changes, removed bean