Remove email change & conditionnal comments template loading