Improve the main snippet in cc-mode
Remove the main snippet from c++-mode

This snippet is already inherited from cc-mode.