form templates cleanup