removed unused functions
Merge origin/master