Remove again P705 before merge