Move CRC value out of VCS