OPAL-2240:Removing unnecessary code