Minor fix

Something went wrong while deleting some classes,
So here's the working version right before the merge