p3 cleanup