PSTWO-407 - updated the files to remove redundant code.