Clean up the old code for xCRG

[chunyuma]

Given that we have fully switched to the new xCRG, after discussion with Dr. Koslicki @dkoslicki, I plan to clean up the xCRG code to improve maintainability across the codebase.. If you have any objection, please let me know. Thank you!