Deprecated templates removed, some code moved to filters, bug fixed in mydata: