diff --git a/vimrc b/vimrc
index 1473ad8..98079e2 100644
--- a/vimrc
+++ b/vimrc
@@ -153,24 +153,13 @@ endfunction
 nmap <silent> <leader>q :call ToggleQuickFix()<cr>
 nmap <silent> <leader>l :lclose<cr>
 
-" deoplete configuration
-packadd! vim-hug-neovim-rpc " https://github.com/roxma/vim-hug-neovim-rpc.git
-packadd! nvim-yarp          " https://github.com/roxma/nvim-yarp.git
-packadd! deoplete.nvim      " https://github.com/Shougo/deoplete.nvim.git
-" Disable completion messages:
-set shortmess+=c
-let g:deoplete#enable_at_startup = 1
-call deoplete#custom#option('num_processes', 1)
-call deoplete#custom#option('max_list', 30)
-call deoplete#custom#option('auto_complete_delay', 25)
-call deoplete#custom#option('auto_refresh_delay', 50)
-call deoplete#custom#option('refresh_always', v:false)
-call deoplete#custom#option('omni_patterns', {
-\ 'go': '[^. *\t]\.\w*',
-\})
-" <TAB>: completion.
-inoremap <expr><S-Tab>  pumvisible() ? "\<C-p>" : "\<S-Tab>"
-inoremap <expr><Tab>  pumvisible() ? "\<C-n>" : "\<Tab>"
+packadd! async.vim            " https://github.com/prabirshrestha/async.vim.git
+packadd! asyncomplete.vim     " https://github.com/prabirshrestha/asyncomplete.vim.git
+packadd! asyncomplete-lsp.vim " https://github.com/prabirshrestha/asyncomplete-lsp.vim.git
+
+inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+inoremap <expr> <cr> pumvisible() ? asyncomplete#close_popup() . "\<cr>" : "\<cr>"
 
 " vim-markdown configuration:
 let g:vim_markdown_conceal = 1
@@ -263,7 +252,6 @@ packadd! vim-go             " https://github.com/fatih/vim-go.git
 " LSP configuration:
 packadd! vim-lsp            " https://github.com/prabirshrestha/vim-lsp.git
 packadd! vim-lsp-settings   " https://github.com/mattn/vim-lsp-settings.git
-packadd! deoplete-vim-lsp   " https://github.com/lighttiger2505/deoplete-vim-lsp.git
 
 let g:lsp_settings = {
       \ 'gopls': {