[BACKLOG-503] Clean up data access
Merge pull request #511 from scottyaslan/devBranch

[BACKLOG-503] Clean up data access