P12 cleanup