unused code removed. close #29