Simplify completion routine for remove(), adjust to periscomp 0.68+