Remove classes not used yet,
I made a branch for that