* Change cvar usages to use CVarDef and define them in CCVars * Merge fixes * Remove duplicate cvar registration