Removed commented code
Merge branch 'ivan'