ENYO-2432: Added comments and some dead code cleaning