Add Nerdtree back in and remove dups