Remove disused form templates, add 2x new