modify templates and remove a few old items