Deleting existing legacy(PF-3.5) code