p705: cleanup ?