CRAFTERCMS-103: Removing code commented
Merge remote-tracking branch 'alvaro/master'