remove useless class
cleanup code