Remove all references to SoQLLocation