remove p2 subsystem (still some left in l2phase3)
mostly fixes to note subsystem (some p2 references removed also)