PL Code cleanup

Mainly commented (useless) code removal