Remove optionSpecificFeedback and updated templates call