OC-6110
Checking in code cleaning up not necessary code lines