More form standardisation
Removed dead analytics templates