Remove unused GM code
Fix fanchart error