Clean up of forms templates