Cleans up new crc code.  Removes c++ flags from CFLAGS.