ITACLOUD-87: Removed redundant code
Merge remote-tracking branch 'origin/rdemo2' into rdemo2