Remove old refactored class