remove the unused class
Make the unittest work