More SY removal and validation for teacher section