Remove SPH specific code from GCM completely