unused code removed
Merge origin/master