Remove commented code
Merge origin/master