Fix removed classes