CRAFTERCMS-103: Removing code commented