p705: cleanup ?

(cherry picked from commit c96f6d82f7242660eb088f4c94247c200f0c0fdf)
fix

(cherry picked from commit cf74cd184b08e3db6d67487dec2124aa22acd6c3)