working on cleanup primarily
last commit before branching for the 2 sql providers