[REFACTORING] Remove old classes