[REFACTORING] Remove deprecated classes