Remove brace completion
Fix logic