Attempt #2 to remove sql reference