Remove -C and -N vi compatibility arguments