Remove references to GCF