Remove already unnecessary template fields