[BACKLOG-503] Clean up data access
Merge pull request #510 from scottyaslan/devBranch5.2

[BACKLOG-503] Clean up data access