Update classes with the recently removed options