[Cl_Task_1] refactor and delete unused class