fixing some redudant code in PcSoftware
12345