Make tasky runout of the box by fixing sql reference

Also added some suggested code clean up :-)
Once the pcl version is supported in the nuget you can switch back to this.