closes #1429, closes #1472, closes #1358

Is this partial still used anywhere?  If so, can the html template be used so this can be deleted?