Remove SoQLLocation completely