removed non used class. close #32