Refactor: delete useless classes