completion: cleanup