Remove c++ cruft
merge rollover task/cmd
rename
make it c