bug fix

+ remove unused method
+ fix bug