FOP2 notes cleanup