diff --git a/vimrc b/vimrc
index 8921658..5e86da5 100644
--- a/vimrc
+++ b/vimrc
@@ -147,10 +147,6 @@ augroup END
 augroup cprog
   au!
   au BufRead,BufNewFile *.[ch]     set cindent
-  " simulate C++ comments (sort of) and provide a means to uncomment easily
-  map //		^i/* <ESC>$a */<ESC>
-  map \\		bhh/ *[*][/]<CR>d/[/]<CR>x?[/][*]<CR>dw
-  " map //        0v$gc
   call TabSize(4)
 augroup END
 
@@ -324,6 +320,8 @@ nnoremap  <leader>b :b #<CR>
 map <F8>   :split<CR>
 map <F9>   :only<CR>
 
+map //        gc$
+
 " map <F11>  :cal SetSyn("c")<CR>
 " map <F11>  :syntax sync fromstart<CR>
 nnoremap <leader>ss :syntax sync fromstart<CR>