#48 old classes removed