Templates: Cleanup the fields