Remove Unuseful Class