My old classes should be removed (this one and the others)...