Completion support - clean up