§ 21-7 is repealed, effective October 1, 2018.