Commented code removal
code cleaning
code cleaning
code cleaning
code cleaning
code cleaning
code cleaning
code cleaning
Merge origin/master