refactor
refactor remove class