[TASK] Remove unused classes from before the rename