remove unused method
Merge origin/master