Optimized mo/pe/so deletion, fixed so deletion